Trying to get HHVM running
Merge branch 'master'