Hand-merge of https://github.com/theodi/odi-chef/pull/4

Which was a bit wrong anyway
Merge branch 'refs/heads/master' into feature-add-feed-redirects

Conflicts:
	roles/quirkafleeg-frontend.rb