start adding some cool new vim plugins
Merge branch 'master' into laptop

Conflicts:
	_vimrc
add credential cache options for git passwords