Added merged branch cleanup
Moar vim!
Moar!
Merge branch 'master' of ssh://bitbucket.org/muchzill4/setup

Conflicts:
	dotfiles/.vimrc