travis

Ready to review and merge.
Please ask @amunslow to activate travis when this is merged.