Refactored Git aliases and set default push & pull behaviour
Merge branch 'master' of github.com:Luey/dotfiles

Conflicts:
	git/.gitconfig