Reogranized where settings are (allowing vundle to compelete first), plus trying ctrlp
Merge branch 'master' of https://github.com/marsol0x/dotfiles

Conflicts:
	vimrc