Updates

Cleans some stuff up
Adds travis-ci support