let's give this a try
Merge branch 'codesign' of github.com:keybase/node-client into codesign

Conflicts:
	lib/command/dir.js
	src/command/dir.iced
Merge branch 'codesign' of github.com:keybase/node-client into codesign

Conflicts:
	lib/command/dir.js