Move media files out of deploy directory
Merge branch 'master' into move-media

Conflicts:
	cookbooks/pycon-2014/templates/default/local_settings.py.erb
ensure directory exists
Merge pull request #31 from python/move-media

Move media files out of deploy directory