xlogin: Keep xlogin@.service active even after .xinitrc died
Fixed a few bugs reported by Ole Ernst
Merge branch 'master' into next