Add Travis-CI configuration
Merge branch 'dev' into cli