update .travis.yml
fix indention in channel.vala
Merge branch 'master' into c