Tidy bashrc - remove crufty commands and logic
Merge branch 'master' of github.com:willdollman/dot-config

Conflicts:
	bashrc