wait until whoami comes back before updating device
Merge branch 'master' of github.com:octoblu/generator-meshblu-connector

Conflicts:
	package.json