automatic deploy now pulls before push - should leave heroku repo intact
adapted .travis.yml back to original
merged: automatic deploy leaves heroku git repo intact