Upgrade travis build, clean up targets for CI.