Merge pull request #35 from apache/tristan/release-cleanups

WIP: Various cleanups in order to address issues with initial apache release