More stuff.
Merge branch 'master' of github.com:trq/dotfiles

Conflicts:
	vimrc