Changing from peter settings to joe settings
	modified:   .bashrc_common
	modified:   .bashrc_mac