Merge branch 'development' into testing
Updating .travis.yml
Merge pull request #2 from domenato/testing

Merge .travis.yml from testing to development