restore value hash + add test harness
Merge branch 'master' of github.com:mapnik/mapnik