Merge pull request #90 from tgrrtt/develop

Fixed travis syntax stuff