Adding options for separate client/server websocket settings
Merge pull request #531 from jprjr/master

Add options for separate client/server websocket settings