small tweaks and fixes for rails3
geoJSON download of annotations
fixed export deletion routes
Merge branch 'rails3' of https://github.com/jywarren/mapknitter into rails3
fixed aws routing