Address #175
Merge branch 'master' of github.com:keybase/node-client

Conflicts:
	src/trackwrapper.iced