Merge pull request #7 from toeb/cli_rework

updating mastre branch to create a working basis version
Update .travis.yml
Update .travis.yml
Update .travis.yml
Update .travis.yml
Update .travis.yml
Update .travis.yml
Update .travis.yml
Merge branch 'devel' into cli_rework