Fixed tanimoto double error
Cleaned up and fixed minor bugs
Updated make file with new cpp files