Ignore gitconfig
Remove duplicate command
Add Heroku
Add Boxen environment
Merge branch 'master' of github.com:conatus/dotfiles

Conflicts:
	zshrc