Add travis support + code cleanup / simplification

Please add this package to the list of packages tested by travis.
I'm using hydro for the travis test.