Merge branch 'master' of github.com:theodi/cuke-chef

Conflicts:
	site-cookbooks/odi-website-deploy/recipes/default.rb
Put rewrite rules for courses.json and lectures.json into the vhost file
Merge pull request #6 from theodi/feature-put-rewrite-rules-in-vhost

Put rewrite rules in vhost