Reworked dictionary code :

 * finally removed #ifdef's with old merge method
 * use autoPtr::ptr() instead of autoPtr::() to reduce cloning
 * eliminated a few add() methods that are covered by the templated form
 * added a 'set()' method that forces overwrite - symmetric with HashTable