vim: add Ctrl-P plugin
Merge branch 'master' of github.com:jldailey/dotfiles

Conflicts:
	.gitmodules
...
...
some win32 improvements