Minor refactoring/improvement; Adds travis-ci