Clean up

Move app and services to apps.sh
Move OS X settings to osx.sh