Final cleanup [DO NOT MERGE]

Leave this open, got a few more things to cleanup.

This will get travis going on commits so we can see when we've got the tests passing.