Real submodules
Merge branch 'master' of https://github.com/Cydonia7/.dotfiles

Conflicts:
	vim/bundle/airline
	vim/bundle/ctrlp
	vim/bundle/fugitive
	vim/bundle/tmuxline