Cleanup settings xml

I think it makes more sense to keep the travis stuff in a subdirectory, rather than a separate branch (?)