Merge pull request #907 from assefay/inasafe

---

Possible optimization for raster floods on roads.
I have kept both ways for now so that It is easier to compare for validation purposes.
Code formatting and variable naming cleanups.
Merge pull request #1 from timlinux/develop

More formatting improvements for PR #906