Bug fixes to get base Origin tests passing
Merge pull request #107 from kraman/master

Bug fixes to enable broker/node seperation and get base Origin tests passing