Add support for Heroku
Merge branch 'feature/heroku' of github.com:yabawock/mackup into yabawock-feature/heroku

Conflicts:
	CHANGELOG.md