rearranging and commenting.
Merge branch 'master' of github.com:drbarrett/dotfiles

Conflicts:
	bashrc