Add ctrlp back

Selecta doesn't work with MacVim or I'm doing something wrong...
Expand the sidebar to cope with random fucking space
Merge branch 'master' of github.com:ghickman/dotfiles

Conflicts:
	.gitmodules
	vim/vimrc
Use selecta to pick from branches list