added example of travis.yml file - docs update
Merge branch 'master' into linux