count directories as files (fixes #607)
Merge pull request #626 from alex2108/master

staggered versioner: count directories as files (fixes #607)