resolve conflict
rename expected grid test file
Merge branch 'master' of github.com:mapnik/node-mapnik into future-rendering-api