mock http results
mock http server
Merge pull request #73 from Trott/mock-http

Mock http
Merge branch 'master' into millennium