- better usage of mapnik::singleton instance in occi datasource
- occi small cosmetics