minor tweaks
fswitch for header files
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	.gvimrc
	.zsh.d/20_environment
npm bin