Merge pull request #111 from jasnow/master

Changed bcrypt-ruby to bcrypt gem (name change; remove warning) + Rebuilt Gemfile.lock file

Gemfile

@@ -60,7 +60,7 @@ end
 gem 'jquery-rails'
 
 # To use ActiveModel has_secure_password
- gem 'bcrypt-ruby'
+ gem 'bcrypt'
 
 # To use Jbuilder templates for JSON
 # gem 'jbuilder'

Gemfile.lock

@@ -35,8 +35,6 @@ GEM
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     bcrypt (3.1.7)
-    bcrypt-ruby (3.1.5)
-      bcrypt (>= 3.1.3)
     better_errors (1.1.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -213,7 +211,7 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     raindrops (0.13.0)
-    rake (10.3.0)
+    rake (10.3.1)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.3)
       ffi (>= 0.5.0)
@@ -306,7 +304,7 @@ PLATFORMS
 
 DEPENDENCIES
   aruba
-  bcrypt-ruby
+  bcrypt
   better_errors
   binding_of_caller
   brakeman