Add heroku toolbelt to path
Set git push default to simple

Conflicts:
	.gitconfig