cleaned up by adding aliases properly
Merge branch 'master' of https://github.com/davidjpeacock/DOTfiles

Conflicts:
	.gitconfig