Added count_combos to perm.h and is_square to numeric.h