Add HHVM machine and Solr Machine