Misc changes
Merge branch 'master' of https://github.com/rjabaker/Skynet