Adding HHVM to build matrix
Removing double 'matrix' entry
Merge pull request #5611