Re-implemented support for using --grid flag rather than --loginuri to select server.
Merge branch 'Working' into ExperimentalPlugin
Added count back to output.