Clean up systmed config

This needs more work if I wan't to stop using xinit (and .xinitrc).
Though I think Wayland will interact much better with systemd so just
waiting for it to become usable is probably easier and more worth it in
the long run.
Clean up systmed config

This needs more work if I wan't to stop using xinit (and .xinitrc).
Though I think Wayland will interact much better with systemd so just
waiting for it to become usable is probably easier and more worth it in
the long run.
Merge branch 'master' into grapefruit