Quickstart add request: ryanj/restify-postGIS
manually resolving merge conflicts