Index: /trunk/data/validator/ignoretags.cfg
===================================================================
--- /trunk/data/validator/ignoretags.cfg	(revision 14579)
+++ /trunk/data/validator/ignoretags.cfg	(revision 14580)
@@ -222,4 +222,5 @@
 K:historic=wreck
 K:historic=charcoal_pile
+K:historic=heritage
 ;
 ; Landcover Tags
@@ -326,5 +327,5 @@
 ;
 ; Tags not yet decided (to remove from this section when added or deprecated) 
-; see josm tickets: 10759 16315 16658 16793
+; see josm tickets: 10759 15774 16315 16658 16793
 ;
 K:man_made=mast
@@ -336,2 +337,3 @@
 K:historic=citywalls
 K:crossing=zebra
+K:water_source=main