Dirks flavour
Merge branch 'master' of github.com:dboonz/dotfiles

Conflicts:
	_vim/.netrwhist
	_vim/bundle/command-t
	_vimrc