Add new syntax highlighting and git plugins
Merge branch 'master' of github.com:jimmyhillis/dotfiles

Conflicts:
	gitconfig.config