Fixes
Merge branch 'master' of github.com:dmuth/Dougs-Drupal-Templates