formatted bash_aliases file
Merge branch 'master' of https://github.com/rdness/aliases

Conflicts:
	cygwin/bash_aliases