building/testing now works
Merge branch 'master' of github.com:skynetservices/skynet2