Added json-autotype and wordpass.
Merge pull request #382 from mgajda/master

Added json-autotype and wordpass.
Merge branch 'master' of github.com:fpco/stackage
Temporarily revert #382
Merge branch 'master' into new-upload