merges in workstation config changes, makes settings more modular

Conflicts:
	.homesick_subdir
	home/.Xdefaults
	home/.bash_profile
	home/.i3/config