Merge pull request #14 from JohnMcLear/develop

Update to latest
Merge pull request #15 from JohnMcLear/develop

Update to latest
Commented out unused server code
Added websockets back in
Added delay to draw path test spec for xhr polling
Added delay to pencil path test spec for xhr polling
Added delay to clear canvas test spec for xhr polling
Merge pull request #156 from tranek/develop

Added delays to test specs, websockets, and commented unused server code for now