Major cleanup
More cleanup
Merge remote-tracking branch 'origin/jrkBookAir' into luxo4

Conflicts:
	bash_profile
	profile