Updated tests to reflect changed flood impact function (polygon hazard): Commit 38486cea5
Updated characterisation test for windows for render checker
Ide updates only
Fixed merge conflict
Resolved merge conflicts
Fix test for map render on ubuntu 12.10
Resolved merge conflicts
Stop tests locking up when docs not present and running show help
Pylint fix