Add whitespace
Make ctrl-p a little more robust
Merge branch 'master' of github.com:johntyree/dotfiles

Conflicts:
	vimrc.local