Merge pull request #269 from jasnow/master

Upgraded app to ruby 2.1.0
Update .travis.yml
Merge pull request #270 from jasnow/master

Upgraded 2 gems by rebuilding Gemfile.lock file