Start pulseaudio automatically
Merge branch 'master' into home

Conflicts:
	i3config