Travis refactor

- "Current" still builds, but does not affect overall pass/fail results.
- several cleanups