Paraedit & lldb
Merge branch 'master' of github.com:sentientmonkey/vimfiles

Conflicts:
	.gitmodules
Fix merge