FF 24.
Build.
intro page to d1 users with a goldenticket
update to proper d1-to-d2 url
Cleanup.
Handling JSON error.
Closed #213.
Bump.
Cleanup and bump.
Merging channels.
Build.
Merge branch 'self-hosted'

Conflicts:
	builds/disconnect.xpi
	builds/disconnect.zip
	firefox/content/overlay.js
	firefox/install.rdf
Revert "Merge branch 'self-hosted'"

This reverts commit 58657ef698cb4e57e53fc8e45041fb6b50389cbc, reversing
changes made to 8dacb31224e484942ee7732dc1546b59ee204d79.
Revert "Merge branch 'self-hosted'"

This reverts commit 58657ef698cb4e57e53fc8e45041fb6b50389cbc, reversing
changes made to b4313e7caf522609d85d832f2724a89620fd1ea5.
Revert "Revert "Merge branch 'self-hosted'""

This reverts commit 39903f13229b9c94668a41046fb9fe049aa2e9eb.
Removed "updateURL".
new url
add description, delete commented out code
notification works
merge