Bundle update
Add .ruby-version file
Merge pull request #11 from rnmp/update-rails

Update Rails
Merge branch 'master' into password-reset