Minor fixes
Added hhvm to travis
Merge pull request #57 from GrahamCampbell/master

Minor Tweaks