more refactoring, tests and cleanup
Merge branch 'master' of https://github.com/BastiTee/pyntrest