Errors fixes, Cleaning code, Improvement and addition of tests

test/testfiles/phrase_settings.php

@@ -0,0 +1,20 @@
+<?php
+
+// These settings control the import of special phrases from the wiki.
+
+// class/type combinations to exclude
+$aTagsBlacklist
+ = array(
+    'boundary' => array('administrative'),
+    'place' => array('house', 'houses'),
+   );
+
+// If a class is in the white list then all types will
+// be ignored except the ones given in the list.
+// Also use this list to exclude an entire class from
+// special phrases.
+$aTagsWhitelist
+ = array(
+    'highway' => array('bus_stop', 'rest_area', 'raceway'),
+    'building' => array(),
+   );