Change header link to block style (fixes blank margin)
Update Nginx quickstart guide

As referenced in the main quickstart guide, the proxy header
X-Forwarded-Proto needs to be set to $scheme, not
$http_x_forwarded_proto
Merge pull request #1046 from davewongillies/docs-nginx-config

Update Nginx quickstart guide
Allow read choice to be customized
Allow additional tags in event stream

This adjusts the stream annotations to support any number of choices for tag value counts. It also adjusts the default value to show users (which is a slight change, as it means everyone will get users if the tag is present).
Return the error ID as X-Sentry-ID for javascript requests
Add labels for sentry:filename and sentry:function
Sort annotations
Adjust default tags to support internal values
Ensure keys are decoded from query params
Merge branch 'master' into node-store

Conflicts:
	src/sentry/app.py
	src/sentry/conf/server.py
	src/sentry/models.py
	src/sentry/testutils.py
Add namespace imports
Bump version to 6.4.0
Changelog for 6.4.0 and 6.3.0
Explicit r=1 on Riak reads
Add SENTRY_INDEX_SEARCH
Quick hack to prevent massive nodestore queries
add datetime and time_spent to event repr
Add full datetime as title tooltip
Mention stream annotations in changes