cookbook updates for caktus pycon site
bump version number
Merge branch 'master' of github.com:coderanger/psf-chef

Conflicts:
	cookbooks/pycon-2014/recipes/app.rb
	cookbooks/pycon-2014/templates/default/local_settings.py.erb