Fancy bash prompt and remove unused aliases

Conflicts:
	bashrc
Tidy up generic .bashrc