conflicts ahead
Merge branch 'master' of github.com:keybase/messenger-inbox-server

Conflicts:
	config/db.iced
	package.json
some little nits