adding git push (for windows not having zsh git plugin)
Merge branch 'master' of github.com:unphased/vim-config

Conflicts:
	.aliases.sh