There is no PROJ_LIB gdal option
There is no PROJ_LIB gdal option

Reverting the change made to proj config block. Also fixes an
error in the previous commit in the GDAL_DATA block.

Toblerity/Fiona,rbuffat/Fiona,rbuffat/Fiona,Toblerity/Fiona