added automatic colored output of nosetests to bashrc
set vim as default git editor
Merge branch 'master' of github.com:sjotterman/config

Conflicts:
	.bashrc