fix some minor stuff so it's easier to get to datastreams stuff now
Merge branch 'devbranch-dhiller' of github.com:deanhiller/databus into devbranch-dhiller