formatting
Merge remote-tracking branch 'origin/features' into features
Still working up the new Update geoupdate form the geostatus page. Will need to make it work off a lightbox popup.