Daemon update, lots of stuff
Merge branch 'master' of github.com:nickelpro/spock