Another cmake/travis fix.
Merge pull request #19 from ahmedcharles/development

Another cmake/travis fix.