Initial fork, and basic cleanup / changes for travis-ci