added minor fixes from trunk since release of 1.7
Merge branch 'master' of https://github.com/mjdorma/yara-ctypes