Trans background in vimrc
Merge branch 'master' of github.com:TomNomNom/dotfiles

Conflicts:
	.vimrc