Merge branch 'master' into sudoman-mods

This file uses a new method of selecting/not selecting GRUB_PC.

diff --cc class/50-host-classes
index c4e1889d0a38803e385044b7d950ed2d595c9fff,3a2c4210ee0a4566e3b144103b1d3cff65ee309e..b4aa0b168b769bd857be50e8d2dd12b750c11a82
--- 1/class/50-host-classes
--- 2/class/50-host-classes
+++ b/class/50-host-classes
@@@ -64,9 -67,16 +64,12 @@@ case $HOSTNAME i
        ;;
      crmdevserver*)
        echo "FAIBASE WWW CIVICRM SYSADMIN VM MYSQLD"
 -      nogrub=1
        ;;
 -      nogrub=1
+     gnusocial*)
+       echo "FAIBASE WWW SYSADMIN VM MYSQLD"
+       ;;
      *)  
          echo "FAIBASE"
 -      nogrub=1 
        ;;
  esac