backup
mv .vim to .dotfiles/.vim
init .xmonad
Merge branch 'master' of github.com:mckelvin/dotfiles

Conflicts:
	.vim/bundle/snipmate.vim
	.vim/bundle/vim-powerline