Merge pull request #110 from Kunstmaan/update_default_site

Update default site generator
Merge branch 'master' into upgrade_to_bootstrap-3

* master: