Changed Itr name for count where it makes sense
Further Iterator -> Counter rename
Merge remote-tracking branch 'origin/bugfix' into fuse
Fixed sorting bug in Directory. Fixed Directory tests.
Fixed some style issues.