Improved hhvm support
Merge pull request #142 from GrahamCampbell/hhvm

Improved HHVM Support