Removed git aliases and moved some to the .gitconfig.
Merge branch 'develop' of github.com:Cireon/dotfiles into develop

Conflicts:
	.bash_profile