fixed compilation errors and more work on dir_iterator
Merge branch 'master' of github.com:jschmerge/xos