add Gemfile.lock for heroku
Update .travis.yml.
Merge branch 'master' of github.com:3100/trahald