made changes to gdalwarp command call, probably more needed
Merge branch 'stephen'