travis+heroku setup
Merge branch 'master' of github.com:WonderCoders/wondercode
restores Gemfile.lock (required for heroku)