better git mergetool handling and better vim outline mode
Merge branch 'master' of github.com:rdeits/config

Conflicts:
	zshrc