Merge pull request #24 from mikey179/master

changelog & more reliable travis build