Chaged startup order and some minor fixes and cleanups.
updated snarl admin to now use roles not groups.
Added snarl-diag tool.
improved snarl-diag.
Merge branch 'test' into dev