Possible remedy for #1287
Merge pull request #1289 from timlinux/issue-1287

Possible remedy for #1287 - mac fails on yosemite for mem checker
Merge branch 'develop' of https://github.com/AIFDR/inasafe into generic_categorised_hazard
fixed pep8