Bump bump bump
Naked domain thing
Should probably test for this
Merge branch 'refs/heads/master' into feature-redirects

Conflicts:
	environments/quirkafleeg-preduction.json
	site-cookbooks/quirkafleeg-deployment/libraries/helpers.rb