herald integration
Merge branch 'herald-integration' of github.com:Kestanous/Telescope into Kestanous-herald-integration

Conflicts:
	.meteor/versions
	packages/telescope-kadira/versions.json
	packages/telescope-notifications/lib/notifications.js
re-enable emailNotifications setting
kadira version bump
Merge branch 'Kestanous-herald-integration'
wrap newsletter banner helpers in startup block
Not using Notifications collection anymore, so get rid of this migration
Merge remote-tracking branch 'upstream/master' into master-upstream
Update to use bengott:avatar 0.1.2
Merge pull request #487 from bengott/avatar-tweaks

Update to use bengott:avatar 0.1.2
Merge remote-tracking branch 'upstream/master' into master-upstream
Merge branch 'master-upstream'