Wooo more changes.
Merge branch 'master' of github.com:rcoppolo/dotfiles

Conflicts:
	vimrc