Merge branch 'master' into j_constr

deploy/ubm_schema.sql

@@ -49,6 +49,11 @@ CREATE TYPE tps."DCARD" AS (
 COMMENT ON TYPE tps."DCARD" IS 'Discover Card';
 
 
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> master
 --
 -- Name: DMAPI; Type: TYPE; Schema: tps; Owner: -
 --

readme.md

@@ -10,6 +10,7 @@ The goal is to:
 It is well suited for data from outside systems that 
 * requires complex transformation (parsing and mapping)
 * original data is retained for reference
+* don't feel like writing a map-reduce
 
 use cases:
 * on-going bank feeds