Code formatting tidy-ups only
Comment out unused vars in flood on roads gdal IF
Merge pull request #1263 from ismailsunni/version-2_1_1

Version 2 1 1
Merge branch 'master' into develop
Add changelog.
Simplyfy polgyons with level 1 before intersecting roads for faster performance.
Merge remote-tracking branch 'origin/master' into travis
Fixes for travis building and merge changes from akbargumbira
Merge pull request #1262 from timlinux/travis

Travis support
Merge remote-tracking branch 'origin/develop' into faster-line-intersect
Merge pull request #1264 from timlinux/faster-line-intersect

Faster line intersect
Also build travis on master changes
Merge pull request #1266 from timlinux/develop

Also build travis on master changes
Merge branch 'aifdr_develop' into version-2_1_1
Bump version 2.1.1 and update changelog.
Update changelog.
Update CHANGELOG.
Update changelog again.
Merge pull request #1267 from ismailsunni/version-2_1_1

Version 2 1 1
Merged all changes from develop