Stuff
Add heroku shortcuts
Merge branch 'master' of github.com:snikch/dotfiles

Conflicts:
	.gitmodules
Add postgres to path