Taking cumulus out for a spin
Updated static/media urls for production
Merge pull request #11 from dustinfarris/update-configs

Update server configs
Merge pull request #10 from dustinfarris/search-problem

Fixing search bug
Merge branch 'master' into 4-spaces

Conflicts:
	dustinfarris/settings/settings.py
	fabfile.py
Removing media and static directories from production nginx config
Added custom storage backend to combine cumulus and compressor
Beginnings of rax support
Using django-rax
Updated requirement for python-twitter
Hiding sensitive information.
Back to HTML :(
Fixing extends
More template fixes
Merge branch 'master' into staging

Conflicts:
	fabfile.py