Cleanups

- Enable py34 on Travis
- Reduce changes where possible