Resyncing to i3-home repo
Merge branch 'master' of github.com:viktorsmari/i3-home

Fixing a lot of merge conflicts

Conflicts:
	config