Fix issue with Django 1.5 no longer using simplejson for serialisation, causing it to fail
Merge branch 'master' of git://github.com/uAnywhere/sentry into uAnywhere-master

Conflicts:
	setup.py