progress
Merge branch 'master' of github.com:keybase/messenger-client

Conflicts:
	lib/post.js
	lib/thread.js