Fix-up arguments to render-map-csv
Merge db158094892e5c6e862a416c9ffe2a29786c28c8 into 529b5e1788994658a1c833f9b291eaa6824c7ef6
Add test for issue #19