Remove unused aliases

Conflicts:
	bashrc
Tidy up generic .bashrc