Remove command-t add ctrlp
Merge branch 'master' of github.com:ebruning/dotfiles

Conflicts:
	vimrc