GeoCouch

Make COUCH_SRC parsing less fragile