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

Conflicts:
	vimrc
Fix stuff,
Merge branch 'master' of github.com:trq/dotfiles