imapfilter
Merge branch 'master' of github.com:tlevine/desk

Conflicts:
	install