TODO: Clean up tests / dependencies / TravisCI config