Fix build of master branch to match former json-rpc build; Fixed programmatic control of shanty logging
Merge branch 'refs/heads/master' into jwight/refactor