Small ctrl-p ignore tweaks, others
Various tweaks
Merge branch 'master' of https://github.com/wyantb/Settings

Conflicts:
	vimrc
I don't much like merge files