Merge branch 'feature/101-core-integration' of https://github.com/jezcope/oabutton-server into feature/101-core-integration
bumped httpretty to 0.7.0 for osx problems