Added NSOrderedSet to hasCountOf matcher

It's also a collection that has -count, so added it to the matcher.

I'm not sure why there are so many changes on the commit here, probably because I merged github's fork.

My changes are on commit ac22d31d1e0938ae5003b8b2a6d1cdf32f8e434b, file https://github.com/apparentsoft/expecta/blob/ac22d31d1e0938ae5003b8b2a6d1cdf32f8e434b/src/EXPBlockDefinedMatcher.m