work with the new heroku client
cleaned up the code
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json
work with the new heroku client
cleaned up the code