+x on files makes no sense unless they really are executable

rails in the script dir makes no sense, use binstubs or bundler instead

script/rails

@@ -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'

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