Updated to Django 1.5.1
Merge pull request #26 from Bouke/patch-1

Updated to Django 1.5.1
Update CONTRIBUTORS.txt
Replaced tabs with spaces
Merge pull request #30 from shanx/master

Replaced tab indents with space indents in settings.production
Update CONTRIBUTORS.txt
Merge remote-tracking branch 'real/master'

Conflicts:
	requirements/base.txt