junits & refactoring
Merge branch 'master' of github.com:snordquist/mock-http-server