Add auto startup scripts
Merge branch 'master' into osx