Fix travis to heroku upload
Revert changes, it seemed to work before
Merge branch 'develop' of https://github.com/tstehle/raccoonia

Conflicts:
	.travis.yml