Allowing endpoint settings
Merge branch 'master' of git://github.com/guilhermef/sentry into guilhermef-master

Conflicts:
	src/sentry/conf/defaults.py