Prevent non-zero error on not found grep.
Add system profiler to osx diagnostics.
Extend timeouts.
Merge branch 'master' of github.com:ninjablocks/ninja-toolbelt

* 'master' of github.com:ninjablocks/ninja-toolbelt:
  Added some network related commands.

Conflicts:
	package.json
Don't exit on error.
Correct JSON format