made h3s into h2s where appropriate
Merge branch 'master' of github.com:ox-it/moxie-js-client
refactored mixins