Make server/client distinction environment-agnostic
Merge pull request #88 from kumavis/master

Make server/client distinction environment-agnostic