Uses thoughtbot config for ctrl-p nice and fast
Merge branch 'master' of github.com:sajoku/dotfiles

Conflicts:
	vimrc
	vimrc.osx