add macbook configs
Merge MacBook configs into the main tree

Conflicts:
	.bash_profile
	.profile