update ruby version to 2.1.2
updates to gems

had to add devise-encryptable as it is required
changes to devise config
Update all calls to Factory Girl
a few missed FactoryGirl cleanup
resolve deprecation warning - new config would raise error if we passed an invalid, or unavailable locale option
specify ruby version in gemfile, Heroku looks here
Merge branch 'feature/udpate_ruby_version' into develop