Iff on mac, work on FEI
Gdiff against master by default
Let Syntastic be aggressive about style
Merge branch 'master' of github.com:johntyree/dotfiles

Conflicts:
	vimrc.local