Rebase before pushing. This should reduce the incidence of deploy
processes failing due to git conflicts.
Merge pull request #78 from NarrativeScience/feature/rebase-deploy

Fix deploys a bit