Fix missing settings variable for crispy-forms.
Update Gruntfile to respect compass' config.rb
stringified first argument to template's url function for Django 1.5 compatibility
Merge branch 'develop' of github.com:EuroPython/djep into develop
Merge branch 'develop' into feature/registration

Conflicts:
	pyconde/conf/global_settings.py