Making tests pass. Still lots of Pow specific artifcats that need to be removed.
Merge branch 'master' of github.com:webstream-io/josh