Simplified build process
Merge branch 'travis-ci'