Added stuff from work
Merge branch 'master' of github.com:dedmons/dotstuff

Conflicts:
	vim/vimrc