Merge pull request #1 from whitmo/master

Classification of GServerFactory, etc
Merge pull request #2 from whitmo/master

Add tests, remove old server factory
Merge pull request #3 from whitmo/master

minor tweaks
Merge pull request #4 from whitmo/master

Clean up run
remove unused and problematic gservice dep
add a space