Removed a weird '$' in aliases
Merge branch 'master' of github.com:edwardloveall/dotfiles
Merge branch 'master' of github.com:edwardloveall/dotfiles

Conflicts:
	aliases
Switch git log aliases