Use proper check for workaround.
Added joins.
Remove HHVM for now from Travis YML.