Configure local npm installation and add to path
Merge branch 'master' of ssh://github-akesling:/akesling/dotfiles

Conflicts:
	.bashrc
Errant dircolors commit