Switched back to cellar 3.0-SNAPSHOT and just some other minor tweaks .. need to finish getting the integration tests to pass.