Vim update plus ctags, foxyproxy, and pentadactyl
Merge branch 'master' into osx

Conflicts:
	ctags
Updates osx settings