Remove HHVM from travis tests for now
Fix some regeps in tests