trick rocks
blah
blah
Merge branch 'jmp' of https://github.com/Parametric/PyCamp into JMP

Conflicts:
	PyCamp/urls.py
Merge branch 'jmp' of https://github.com/Parametric/PyCamp into JMP