Merged with Mitchell's branch and resolved conflicts. Haml support remains rudimentary.
[ohcount] / test / expected_dir / php1.php /
drwxr-xr-x   ..
drwxr-xr-x - css
drwxr-xr-x - html
drwxr-xr-x - javascript
drwxr-xr-x - php