Add two conduit packages
added more Spock packages
Merge branch 'master' of https://github.com/agrafix/stackage