add - colored term and nvm
Merge branch 'master' of github.com:stites/cfg

Conflicts:
	.bashrc