Remove some old commented code
Tweak the travis config