diff --git a/app/assets/fonts/FontAwesome.otf b/app/assets/fonts/FontAwesome.otf
old mode 100755
new mode 100644
diff --git a/app/assets/fonts/fontawesome-webfont.eot b/app/assets/fonts/fontawesome-webfont.eot
old mode 100755
new mode 100644
diff --git a/app/assets/fonts/fontawesome-webfont.ttf b/app/assets/fonts/fontawesome-webfont.ttf
old mode 100755
new mode 100644
diff --git a/app/assets/fonts/fontawesome-webfont.woff b/app/assets/fonts/fontawesome-webfont.woff
old mode 100755
new mode 100644
diff --git a/app/assets/images/d-logo-sketch.png b/app/assets/images/d-logo-sketch.png
old mode 100755
new mode 100644
diff --git a/app/assets/javascripts/admin/views/admin_groups_view.js b/app/assets/javascripts/admin/views/admin_groups_view.js
old mode 100755
new mode 100644
diff --git a/app/assets/javascripts/discourse/models/post.js b/app/assets/javascripts/discourse/models/post.js
old mode 100755
new mode 100644
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
old mode 100755
new mode 100644
diff --git a/app/assets/javascripts/discourse/templates/post.js.handlebars b/app/assets/javascripts/discourse/templates/post.js.handlebars
old mode 100755
new mode 100644
diff --git a/app/assets/javascripts/discourse/views/post_menu_view.js b/app/assets/javascripts/discourse/views/post_menu_view.js
old mode 100755
new mode 100644
diff --git a/app/assets/javascripts/discourse/views/topic_footer_buttons_view.js b/app/assets/javascripts/discourse/views/topic_footer_buttons_view.js
old mode 100755
new mode 100644
diff --git a/app/assets/stylesheets/application/compose.css.scss b/app/assets/stylesheets/application/compose.css.scss
old mode 100755
new mode 100644
diff --git a/app/assets/stylesheets/application/faqs.css.scss b/app/assets/stylesheets/application/faqs.css.scss
old mode 100755
new mode 100644
diff --git a/app/assets/stylesheets/application/topic-list.css.scss b/app/assets/stylesheets/application/topic-list.css.scss
old mode 100755
new mode 100644
diff --git a/app/assets/stylesheets/components/badges.css.scss b/app/assets/stylesheets/components/badges.css.scss
old mode 100755
new mode 100644
diff --git a/app/assets/stylesheets/components/buttons.css.scss b/app/assets/stylesheets/components/buttons.css.scss
old mode 100755
new mode 100644
diff --git a/app/assets/stylesheets/components/navs.css.scss b/app/assets/stylesheets/components/navs.css.scss
old mode 100755
new mode 100644
diff --git a/app/assets/stylesheets/foundation/base.css.scss b/app/assets/stylesheets/foundation/base.css.scss
old mode 100755
new mode 100644
diff --git a/app/assets/stylesheets/foundation/helpers.css.scss b/app/assets/stylesheets/foundation/helpers.css.scss
old mode 100755
new mode 100644
diff --git a/app/assets/stylesheets/vendor/font-awesome.css.erb b/app/assets/stylesheets/vendor/font-awesome.css.erb
old mode 100755
new mode 100644
diff --git a/app/assets/stylesheets/vendor/normalize.css b/app/assets/stylesheets/vendor/normalize.css
old mode 100755
new mode 100644
diff --git a/app/models/category.rb b/app/models/category.rb
old mode 100755
new mode 100644
diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
old mode 100755
new mode 100644
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
old mode 100755
new mode 100644
diff --git a/script/rails b/script/rails
deleted file mode 100755
index f8da2cffd4d..00000000000
--- a/script/rails
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'
diff --git a/script/version_bump.rb b/script/version_bump.rb
old mode 100755
new mode 100644
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index ef461a0de93..07aa7318160 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -755,6 +755,7 @@ describe Guardian do
   end
 
   context 'can_grant_moderation?' do
+
     it "wont allow a non logged in user to grant an moderator's access" do
       Guardian.new.can_grant_moderation?(user).should be_false
     end
@@ -763,8 +764,8 @@ describe Guardian do
       Guardian.new(user).can_grant_moderation?(moderator).should be_false
     end
 
-    it 'wont allow an admin to grant their own access' do
-      Guardian.new(admin).can_grant_moderation?(admin).should be_false
+    it 'will allow an admin to grant their own moderator access' do
+      Guardian.new(admin).can_grant_moderation?(admin).should be_true
     end
 
     it 'wont allow an admin to grant it to an already moderator' do
@@ -785,13 +786,22 @@ describe Guardian do
       Guardian.new(user).can_revoke_moderation?(moderator).should be_false
     end
 
-    it 'wont allow an moderator to revoke their own moderator' do
+    it 'wont allow a moderator to revoke their own moderator' do
       Guardian.new(moderator).can_revoke_moderation?(moderator).should be_false
     end
 
     it "allows an admin to revoke a moderator's access" do
       Guardian.new(admin).can_revoke_moderation?(moderator).should be_true
     end
+
+    it "allows an admin to revoke a moderator's access from self" do
+      admin.moderator = true
+      Guardian.new(admin).can_revoke_moderation?(admin).should be_true
+    end
+
+    it "does not allow revoke from non moderators" do
+      Guardian.new(admin).can_revoke_moderation?(admin).should be_false
+    end
   end
 
   context "can_see_pending_invites_from?" do