cloning pypy codespeed django deploy for pycon 2014
Merge branch 'master' into pycon2014
refactor out local_settings
updating application_python
fix up missing dependencies
finalized for deployment. fixups in static files and INSTALLED_APPS
Merge branch 'master' into pycon2014

Conflicts:
	Cheffile
	Cheffile.lock
Berks!
Modify Owner to represent Tenant
Merge pull request #15 from python/pycon2014

Pycon2014