Update for postgis 2.1
Merge branch 'stable' of https://github.com/stevage/saltymill into stable