Extracted bits of profile into profile.d.
Merge branch 'master' into mac

Conflicts:
	profile
Finished extracting Homebrew stuff from profile.