wip
wip
Merge branch 'conf/refactor' of https://github.com/prey/prey-node-client into conf/refactor

Conflicts:
	lib/conf/cli.js