Merge pull request #127 from tribal-tec/master

Bump to 1.61 of cppcheck (1.60 gives segfault in dash)
Unify ENV(TRAVIS) and TRAVIS into TRAVIS
Merge branch 'master' of https://github.com/eile/CMake
Merge pull request #128 from eile/master

Unify ENV(TRAVIS) and TRAVIS into TRAVIS
Fix failing include