Load services before everything else
Merge branch 'master' of github.com:voidcontext/thunk