Changed field delimiter in aliases to ~
Merge branch 'master' of github.com:frxstrem/git-aliases

Conflicts:
	aliases