Stuff from work
Merge branch 'master' of https://github.com/mmcclimon/dotfiles

Conflicts:
	vim/gvimrc
	vim/vimrc
Color scheme updates.