heroku be all up in my shit and it's like why
coffe ftplugin
Merge branch 'master' of github.com:alanzoppa/dotfiles

Conflicts:
	.vim/ftplugin/coffee.vim
	.zshrc
upgrades
Merge branch 'master' of github.com:alanzoppa/dotfiles

Conflicts:
	.atom/.node-gyp/.atom/.apm/underscore-plus/1.0.4/package.tgz
	.atom/.node-gyp/.atom/.apm/vim-mode/0.7.2/package.tgz