ctrlp ftw.
Set ctrlp max files.
Merge branch 'master' of github.com:adeslade/dotfiles

Conflicts:
	.vim/bundle/command-t