Merged with Mitchell's branch and resolved conflicts. Haml support remains rudimentary.
[ohcount] / test / expected_dir / php1.php / php /
drwxr-xr-x   ..
-rw-r--r-- 499 code
-rw-r--r-- 145 comment