Update .travis.yml
Fix file permission of files
Remove merge commit marker, add docblock