Add travis builds
Cleaner code
Merge branch 'travis'