Normalizing the diff call
Merge branch 'master' of https://github.com/unphased/vim-config
I just did this so preventing this also should help
Merge branch 'master' of https://github.com/unphased/vim-config

Conflicts:
	.zshrc
fixing weirdness