Fiximports

Woohoo! Merge the fixes to the GAE into the Spatial branch. I coulda done this on the command line but I just wanted folks to be aware of what was happening more explicitly.