merges in i3 config settings

Conflicts:
	.homesick_subdir
	home/.Xdefaults
	home/.i3/config
	home/.tmux.conf