Merge branch 'master' of github.com:zencephalon/.soul

Conflicts:
	.config/sublime-text-3/Packages/User/Preferences.sublime-settings
Ignore irssi config