Add get total needs for impact layer.
Fix merge conflict.
Add total needs to impact layer's keywords.
Better unit tests.
Add point for building in flood_osm_building_impact.py
Fix for #993
Point for building volcano impact function.
Updated rounding
Updated the volcano evecuation IF
Merge branch 'develop' of github.com:AIFDR/inasafe into inasafe-1239-population-rounding

Conflicts:
	safe/impact_functions/inundation/flood_population_evacuation_raster_hazard.py
Update after merge also changed 'to' to 'up to'
Merge branch 'develop' of github.com:AIFDR/inasafe into inasafe-1239-population-rounding
Update tests
tests updated
Possible remedy for #1287
Merge pull request #1289 from timlinux/issue-1287

Possible remedy for #1287 - mac fails on yosemite for mem checker
Fixing tests
Merge branch 'develop' of github.com:AIFDR/inasafe into inasafe-1239-population-rounding
Fixed safe_qgis side tests
test_map seems to be a bit random...