added readme
update readme
fixed merge
updated permutation counting
cleaning up
switched from tr1/unordered_map to std map for compability