added template for okc_env.conf
changed deploy cookbook name to okc
Merge branch 'master' of github.com:mfrasier/okc-cookbooks

Conflicts:
	deploy/attributes/defaults.rb
	deploy/recipes/default.rb
	deploy/recipes/redirect.rb
	okc/recipes/default.rb
	okc/recipes/redirect.rb
	okcra_api/recipes/default.rb
	okcra_api/recipes/redirect.rb