Pull final reorg changes into travis branch for more work there #145

Closed scotthue closed 7 years ago