Fix a whole load of rubbish, add Travis support