Hopefully got every part of the autostart script working.
Merge branch 'master' of github.com:Rovanion/.files