Merge pull request #24 from johnheroy/master

Fix syntax in .travis.yml
Fix travis yml syntax again