Update .travis.yml
Feature 1 added
Feature 1 merged
Fixed a little bug
Merge branch 'release-0.1'