drupal-demo - Updates to better match demo site

Also: Incidental usability improvements to civibuild