Adding FANNParamsAlg.cc, .hh, some tweaks to run_cluster_merge.py
Actually, I missed them last commit.  Whoops.