cleanup default site generator fixtures
Merge branch 'update_default_site' into upgrade_to_bootstrap-3

* update_default_site:
  cleanup default site generator fixtures