add npm installed binaries to PATH
Merge branch 'master' of github.com:jldailey/dotfiles

Conflicts:
	.zshrc
new commits on vim-coffee-script