Use Travis as a CI tool, update tests
Merge branch 'develop'

Use Travis-CI.org for testing new commits