* master:
  Upgrade Node 6.9.1 --> 7.4.0
  Remove extraneous 'nan' module
  Update socket.io-client 1.7.1 --> 1.7.2
  Update socket.io 1.7.1 --> 1.7.2
  Update shelljs 0.7.5 --> 0.7.6
  Upgrade smoke test firefox 50.0.2 --> 50.1.0
  Update browserify 13.1.1 --> 13.3.0
  Upgrade iOS 10.1.0 --> 10.2.0
  Upgrade Safari 10.0.1 --> 10.0.2
  Upgrade Chrome 54 --> 55
  Update to-do
  Client draws lines when network draw events received
  Modify ServerDrawEvent to expose 'from' and 'to' properities
  WIP: Client draws line segment when network draw event received
  Client sends draw events when user draws
  Start testing client drawing networking
  Reorganize client.js networking tests
  Factor out drawLineSegment() in client
  Add RealTimeConnection.triggerDrawEvent
  Add RealTimeConnection.onDrawEvent
  Add RealTimeConnection.sendDrawEvent and getLastSentDrawEvent
  Start to support Draw events in RealTimeConnection test harness
  Start Draw event tests for RealTimeConnection
  Support Draw events on server
  Starting to add support for Draw events in server
  Add ClientDrawEvent.toServerEvent
  Add ServerDrawEvent
  Add ClientDrawEvent
  Update to-do for multi-user line drawing story
  Update socket.io-client 1.5.1 --> 1.7.1
  Update socket.io 1.5.1 --> 1.7.1
  Update mocha 3.1.2 --> 3.2.0
  Update async 2.1.2 --> 2.1.4

* master:
  Attempt to get Touch constructor working (and fail)
  sendTouchEvent takes Touch[] instead of TouchList
  Touch event tests work on touch-enabled Chrome browsers

* master:
  Upgrade smoke test firefox 51.0 --> 51.0.1
  Refactor events' .name property to .name() method
  Minor clean up of RealTimeConnection tests and harness
  Remove test harness waitForPointerLocation()
  Finish generic test harness waitForEvent()
  Also store test harness 'last event' data by event name
  Pass event name into network test harness's waitForEvent()
  Update smoke test firefox 50.1.0 --> 51.0
  Upgrade Safari 10.0.2 --> 10.0.3
  Upgrade Firefox 50 --> 51
  Remove sendPointerLocation() from network test harness
  Remove sendDrawEvent() from network test harness
  Add generic sendEvent() endpoint to network test harness
  Remove RealTimeConnection.triggerPointerLocation
  RealTimeConnection.triggerEvent no longer needs event constructor
  Add .name property to server event instances
  Remove RealTimeConnection.triggerDrawEvent
  Add RealTimeConnection.triggerEvent
  Remove RealTimeConnection.onPointerLocation
  Remove RealTimeConnection.onDrawEvent
  Add generic RealTimeConnection.onEvent
  Remove RealTimeConnection.sendPointerLocation
  Remove RealTimeConnection.getLastSentPointerLocation()
  Genericized RealTimeConnection.getLastSentDrawEvent --> getLastSentEvent
  RealTimeConnection.sendPointerLocation uses sendEvent under the covers
  Connection.sendEvent fails fast if event.name is not defined
  Genericize RealTimeConnection.sendDrawEvent --> sendEvent
  Add .name property to ClientDrawEvent instances
  Update to-do
  Update karma 1.3.0 --> 1.4.0

* master:
  Update selenium-webdriver 3.0.1 --> 3.1.0
  Update browserify 14.0.0 --> 14.1.0
  Upgrade Chrome 55 --> 56
  Clean up client.js
  Clear screen when clear event received
  Send clear screen event when clear button clicked
  Remove duplication in server event reflection tests
  Remove some duplication in server event reflection code
  Server reflects ClientClearScreenEvent as ServerClearScreenEvent
  Finish ClientClearScreenEvent and ServerClearScreenEvent
  Start implementing ClientClearScreenEvent
  Update karma 1.4.0 --> 1.4.1
  Update send 0.14.1 --> 0.14.2
  Update browserify 13.3.0 --> 14.0.0
  Upgrade Node 7.4.0 --> 7.5.0

* master:
  Upgrade browser-side socket.io 1.7.2 --> 1.7.3
  Update socket.io-client 1.7.2 --> 1.7.3
  Update socket.io 1.7.2 --> 1.7.3
  Add debug idea to smoke test version number issue
  Remove extraneous module
  Update selenium-webdriver 3.1.0 --> 3.3.0
  Update karma 1.4.1 --> 1.5.0
  Update shelljs 0.7.6 --> 0.7.7
  Update send 0.14.2 --> 0.15.1
  Update async 2.1.4 --> 2.1.5
  Upgrade Node 7.5.0 --> 7.7.4
  Upgrade Firefox 51 --> 52
  Add performance optimization to to-do
  Temporarily disable smoke test browser version check due to 'undefined'
  Update to-do
  Remove debugging code
  Attempting to debug clear button touch events
  Cliient sends 'remove pointer' event when touch line drawing stops
  Client sends pointer events when touch draws a line
  Client sends 'remove pointer' event when mouse leaves document
  client.js responds to ServerRemovePointerEvent
  Attempting to get client to remove pointer element on RemovePointerEvent
  Server reflects 'remove pointer' events
  Add ClientRemovePointerEvent and ServerRemovePointerEvent

* master:
  Remove extraneous console.log()
  Update browserify 14.1.0 --> 14.3.0
  Update async 2.1.5 --> 2.3.0
  Re-enable console.log when using Karma
  Update karma 1.5.0 --> 1.6.0
  Upgrade Safari 10.0.3 --> 10.1.0
  Upgrade Chrome 56 --> 57
  Combine networking and drawing smoke tests into one
  Server replays events
  Attempt to get server replay test to pass (it doesn't yet)
  Start testing that server replays events (doesn't work yet)
  EventRepository stores and replays events
  Start of EventRepository for storing/replaying events on server
  Update to-do with connection handling plans

* master:
  Refactor RealTimeServerTest.waitForConnectionCount to use async/await
  Update Server, its tests, and run.js to use async/await
  Convert HttpServerTest's beforeEach/afterEach to use async/await
  Convert _http_server_test.js to use async/await
  Start converting HttpServerTest to async/await
  server.js uses async/await
  Finish migrating all RealTimeServerTest tests to async/await
  Async-ify another RealTimeServerTest test
  RealTimeServerTest - make parallel createSockets and closeSockets functions
  Additional improvements to RealTimeServerTest.checkEventReflection
  First pass at async-ifying RealTimeServerTest.checkEventReflection
  Start converting RealTimeServer tests to use async/await
  Upgrade Safari 10.1.1 --> 10.1.2
  Remove jshint.conf.js
  Fix all ESLint errors
  Define ESLint config and rules
  Add (and hook up) eslint.conf.js
  Uninstall JSHint
  Modify lint_runner.js to use ESLint instead of JSHint
  ESLint CLI works
  Install ESLint
  Update WebStorm confirm to support ES6 syntax and async/await
  Upgrade Chrome 58 --> 59
  Update to-do
  Implement first async/await function (doesn't lint yet)
  Convert HttpServer.stop() to use promise
  Convert RealTimeServer.stop() to use promise
  Convert HttpServer.start() to use promise
  Convert RealTimeServer tests' waitForConnectionCount() to use promise
  Convert RealTimeServer tests' createSocket() to use promise
  JSHint no longer rejects code that uses promises
  Convert RealTimeServer test's closeSocket() to use only promises
  Modify RealTimeServer test's closeSocket() to also return promise
  Update vendored client-side socket.io 2.0.1 --> 2.0.3
  Update socket.io-client 2.0.1 --> 2.0.3
  Update socket.io 2.0.1 --> 2.0.3
  Update shelljs 0.7.7 --> 0.7.8
  Update jshint 2.9.4 --> 2.9.5
  Update browserify 14.3.0 --> 14.4.0
  Update async 2.4.1 --> 2.5.0
  Upgrade Node 7.10.0 --> 8.1.2
  Fix minor typo
  Server.stop() shuts down realTimeServer correctly
  RealTimeServer fails fast if HttpServer.stop() is called
  RealTimeServer tests' closeSocket() runs callback after connection closes
  Add RealTimeServer.stop()
  Hack in solution to RealTimeServer test afterEach() timeout race
  Prevent Socket.IO race condition from affecting RealTimeServer tests
  Upgrade Firefox 53 --> 54
  Migrate Socket.IO test cases (spikes) from spike branch
  Update to-do
  Update socket.io-client 1.7.3 --> 2.0.1
  Update socket.io 1.7.3 --> 2.0.1
  Update karma 1.6.0 --> 1.7.0
  Update selenium-webdriver 3.3.0 --> 3.4.0
  Update send 0.15.1 --> 0.15.3
  Update mocha 3.2.0 --> 3.4.2
  Update glob 7.1.1 --> 7.1.2
  Update async 2.3.0 --> 2.4.1
  Upgrade Node 7.7.4 --> 7.10.0
  Upgrade Safari 10.1.0 --> 10.1.1
  Update to-do
  Fix deliberate replayPreviousEvents bug in RealTimeServer code
  RealTimeServer test suite ensure connections are cleaned up
  numberOfActiveConnections() test no longer has race conditions
  Attempting to clean up numberOfActiveConnections() test
  RealTimeServer counts active Socket.IO connections only
  RealTimeServer counts active connections (of any type)
  Attempting to determine # of active realTimeServer connections
  Upgrade Chrome 57 --> 58
  Update to-do
  Attempting to resolve Socket.IO shutdown errors
  Add RealTimeServer.handleClientEvent()
  Simple end-to-end tests of server
  Move RealTimeServer tests from _server_test.js to _real_time_server_test.js
  Move HttpServer tests from _server_test.js to _http_server_test.js
  Stop exposing private functions in HttpServer and RealTimeServer
  Upgrade Firefox 52 --> 53
  Clean up HttpServer interface slightly
  Finish extracting HttpServer from server.js
  Start extracting HttpServer from server.js
  Finish factoring RealTimeServer out of server.js
  Start factoring out RealTimeServer from server.js

* master:
  Ensure RealTimeServerTest's 'shuts down cleanly' test works
  Remove RealTimeServerTest.waitForConnectionCount()
  SocketIoClient.closeSocket() waits for server disconnection
  SocketIoClient.createSocket waits for server connection
  Preparing to make SocketIoClient.createSocket wait for server connection
  Add RealTimeServer.isSocketConnected()
  Convert SocketIoClient to ES6 class syntax
  Remove left-over 'var' keywords (replace with 'const' and 'let')
  Rename TestClient --> SocketIoClient
  Server tests use TestClient rather than duplicating functions
  Factor out TestClient class from RealTimeServerTest
  Work around Socket.IO test hang in RealTimeServer and Server tests
  Attempt to debug Socket.IO test hang
  RealTimeServer sends 'remove pointer' event on client disconnect, but tests hang
  Spike socket.io disconnect behavior
  Update to-do
  Fix URL in comment
  Fix smoke test browser version check
  Upgrade Node v8.1.2 --> 8.2.1
  Update selenium-webdriver 3.4.0 --> 3.5.0
  Update semver 5.3.0 --> 5.4.1
  Update eslint 4.2.0 --> 4.3.0

* master:
  Update to-do
  Rename events' fromSerializableObject() --> fromPayload()
  Rename events' toSerializableObject() --> payload()
  Replace 'var' with 'const' or 'let' in server code
  Convert Server to ES6 class syntax
  Convert RealTimeServer to ES6 class syntax
  Convert HttpServer to ES6 class syntax
  Convert EventRepository to ES6 class syntax
  Finish cleaning up RealTimeServer
  Clean up RealTimeServer
  Ghost pointer doesn't reappear on refresh
  Remove extraneous comments in RealTimeServer
  Upgrade Chrome 59 --> 60
  Update send 0.15.3 --> 0.15.4
  Update mocha 3.4.2 --> 3.5.0
  Update eslint 4.3.0 --> 4.4.1

* master:
  Upgrade smoke tests' firefox 54.0.1 --> 56.0
  Upgrade Safari 10.1.2 --> 11.0.0
  Upgrade Chrome 60 --> 61
  Upgrade Firefox 54 --> 56
  Check dependency versions in 'jake run'
  Add Clock.setInterval()
  Use lolex for fake clock in Clock class
  Attempt to use lolex in Clock--it doesn't work
  Install lolex
  Factor out private 'RealClock' and 'FakeClock' classes in Clock
  Add Clock.millisecondsSince()
  Add _assert.gte()
  Add Clock.tick()
  Add Clock.createFake()
  Add Clock.now()
  Start exploring Clock tests
  Create Clock class

* master:
  Upgrade Node 9.7.1 --> 9.11.1
  Upgrade smoke test Firefox 59.0.1 --> 59.0.2
  Update to-do
  Clean up 'redisplay ghost pointer after timeout' tests
  Test that client pointer doesn't reappear after timeout with ClientClearScreenMessage
  Test that client pointer doesn't reappear after timeout with ClientRemovePointerMessage
  Test that client pointer reappears after timeout with ClientPointerMessage
  Simplify server message tracking in RealTimeLogic tests
  Stop looking at ClientDrawMessage private data
  Add ClientDrawMessage.getPointerLocation()
  Hack together way of making ghost pointer reappear in correct location
  Make sure client is tracked properly after first timeout
  Implement ghost basic pointer redisplay after timeout
  Test that ghost pointer reappears after timeout
  Minor improvements to RealTimeLogic.handleClientTimeouts()
  Upgrade smoke test Firefox 59.0 --> 59.0.1
  Upgrade Chrome 64 --> 65
  Update to-do
  Fix race condition in networked line-drawing smoke test
  Convert line drawing smoke test to use async/await
  Rename 'driver' to 'browser' in smoketests
  Convert font smoketests to async/await
  Convert HTTP smoke tests to use async/await
  Convert smoke tests to use ES6 syntax
  Upgrade Firefox 58 --> 59
  Simplify RealTimeLogic.handleClientTimeouts
  Clarify RealTimeLogic.handleRealTimeEvents()
  RealTimeServer CLIENT_MESSAGE event emits object rather than 2 parms
  Put RealTimeServer event constants in EVENT object
  Convert RealTimeServer.triggerClientMessageEvent --> simulateClientMessage
  Use (dis)connectNullClient instead of triggerClient(Dis)ConnectEvent
  Simplify Server tests and remove RealTimeLogic.numberOfActiveConnections()
  Add 'no-invalid-this' ESLint rule
  Final pass of renaming network 'events' to 'messages'
  Rename 'event' to 'message' in strings
  Rename 'event' --> 'message' in client.js
  Rename ServerPointerEvent --> ServerPointerMessage
  Rename 'event' --> 'message' in RealTimeConnection and tests
  Rename 'event' --> 'message' in __test_harness_server.js
  Rename toServerEvent() --> toServerMessage()
  Rename EVENT_NAME --> MESSAGE_NAME
  Rename 'event' --> 'message' in __test_harness_client.js
  Rename ServerRemovePointerEvent --> ServerRemovePointerMessage
  Rename ServerPointerEvent --> ServerPointerMessage
  Rename ServerDrawEvent --> ServerDrawMessage
  Rename ServerClearScreenEvent --> ServerClearScreenMessage
  Rename ClientRemovePointerEvent --> ClientRemovePointerMessage
  Rename ClientPointerEvent --> ClientPointerMessage
  Rename ClientDrawEvent --> ClientDrawMessage
  Rename ClientClearScreenEvent --> ClientClearScreenMessage
  Update shelljs 0.7.8 --> 0.8.1
  Update send 0.16.1 --> 0.16.2
  Update semver 5.4.1 --> 5.5.0
  Update mocha 4.0.1 --> 5.0.1
  Update lolex 2.3.1 --> 2.3.2
  Update eslint 4.11.0 --> 4.18.2
  Update browserify 14.5.0 --> 16.1.0
  Upgrade Node 9.2.0 --> 9.7.1
  Update karma 1.7.1 --> 2.0.0
  Update to-do
  Upgrade Edge 14 --> 16
  Upgrade Chrome 63 --> 64
  Update to-do
  Clean up RealTimeLogic
  Remove unneeded RealTimeLogic methods
  Simplify RealTimeLogic tests with countRemovePointerEvents()
  Finish converting RealTimeLogic tests to use Null RealTimeServer
  Fix test of RealTimeServer.triggerClientMessageEvent
  RealTimeLogic timeout test checks whole server response
  Upgrade smoke test Firefox 57.0.1 --> 58.0.2
  Upgrade Safari 11.0.2 --> 11.0.3
  Upgrade Firefox 57 --> 58
  Update to-do
  Convert 'ghost pointer timeout' RealTimeLogic test to not use network
  Remove networking from RealTimeLogic 'remove pointer stores in repo' test
  Finish 'replay' RealTimeLogic test
  RealTimeServer sends SERVER_MESSAGE event when sending messages
  Start of support for RealTimeServer SERVER_MESSAGE event
  Start on 'replay' RealTimeLogic test
  Finish translating RealTimeLogic 're-broadcast' test to not use network
  RealTimeServer null clients support broadcastToAllClientsButOne
  Working on RealTimeLogic 're-broadcast' test
  Finish RealTimeServer.connectNullClient() and disconnectNullClient()
  RealTimeServer.connectNullClient shows client as connected
  Start implementing RealTimeServer.connectNullClient()
  Start on null version of RealTimeLogic re-broadcast test
  Rename RealTimeServer.CLIENT_EVENT_RECEIVED --> CLIENT_MESSAGE
  Add RealTimeServer.triggerClientMessageEvent()
  Fix bug that results in wrong client pointer being removed on timeout
  Convert 'remove pointer on disconnect' test to not use network
  Add RealTimeServer.triggerClientConnectEvent()
  Attempt to get Null RealTimeServer working in RealTimeLogic test
  Add RealTimeServer.getLastSentMessage()
  Add RealTimeServer.triggerClientDisconnectEvent()
  Stub in non-networked version of 'remove pointer' RealTimeLogic test
  Null RealTimeServer.broadcastToAllClients() works
  Null RealTimeServer start() and stop()
  Linter allows classes to be defined after they're referenced
  RealTimeServer.createNull() works (but .start() doesn't)
  Move RealTimeServer's HttpServer dependency injection into constructor
  Start tests for Null RealTimeServer
  Update to-do
  Rename RealTimeServer test file from socket_io_abstraction_test.js
  Remove unneeded 'require's in RealTimeConnection
  RealTimeLogic manages RealTimeServer lifecycle at all
  RealTimeLogic no longer starts RealTimeServer
  Start to factor RealTimeServer initialization out of RealTimeLogic
  Rename SocketIoAbstraction --> RealTimeServer
  Rename RealTimeServer --> RealTimeLogic
  Update to-dos, including some comments
  Fix error in Server test's comment
  Create constants for our SocketIoAbstraction event names
  Rename SocketIoAbstraction.emitToOneClient --> sendToOneClient
  Test SocketIoAbstraction.broadcastToAllClientsButOne()
  Factor out code to listen for clientSocket events
  Test SocketIoAbstraction.broadcastToAllClients()
  Test SocketIoAbstraction.emitToOneClient()
  Update to-do
  Test SocketIoAbstraction clientConnect and clientDisconnect events
  Remove RealTimeServer from SocketIoAbstraction tests
  Finish migrating Socket.IO tests to use SocketIoAbstraction
  Move RealTimeServer.numberOfActiveConnections() to SocketIoAbstraction
  Move tests from RealTimeServer to SocketIoAbstraction; not done yet
  Migrate __socket_io_client to use SocketIoAbstraction; start SIoA tests
  Finish hiding Socket.IO behind SocketIoAbstraction
  Add 'clientConnect' event to SocketIoAbstraction
  Upgrade smoke test Firefox 57.0 --> 57.0.1
  Upgrade Safari 11.0.1 --> 11.0.2
  Upgrade Chrome 62 --> 63
  Upgrade WebStorm to 2017.3--changed config settings
  Attempting to add SocketIoAbstraction.emitToOneClient
  Add SocketIoAbstraction 'clientDisconnect' event
  RealTimeServer no longer directly listens for socket.io client events
  Remove socket from processClientEvent and broadcastAndStoreEvent
  SocketIoAbstraction emits 'clientEvent' event
  Add SocketIoAbstraction.broadcastToAllClientsButOne
  Add SocketIoAbstraction.broadcastToAllClients
  Factor out trackSocketIoConnections into SocketIoAbstraction
  Factor out SocketIoAbstraction.stop()
  Include custom node_modules when creating server distribution
  Start factoring out SocketIoAbstraction class
  Prevent GC cycle from causing Clock test failure
  Update to-do
  'jake run' works even if Socket.IO version doesn't match (so we can get it)
  Update socket.io-client 2.0.3 --> 2.0.4
  Update socket.io 2.0.3 --> 2.0.4
  Update lolex 2.1.3 --> 2.3.1
  Update eslint 4.9.0 --> 4.11.0
  Update browserify 14.4.0 --> 14.5.0
  Update async 2.5.0 --> 2.6.0
  Upgrade Node 8.7.0 --> 9.2.0
  Increase RealTimeServer client timeout to 30 seconds
  Ensure that RealTimeServer can timeout a client more than once
  RealTimeServer doesn't timeout clients that have disconnected
  RealTimeServer only sends one RemovePointerEvent when client times out
  Start working on 'only one timeout event' test again
  Add RealTimeServer.onNextServerEmit()
  Upgrade smoke test Firefox 56.0.2 --> 57.0
  Upgrade Chrome 61 --> 62
  Upgrade Firefox 56 --> 57
  Still trying to figure out 'only send event once per timeout' test
  Start testing that remove pointer event is only sent once per timeout
  Reset client timeout on any event, not just move pointer event
  Rename RealTimeServer.onOneClientEvent() --> onNextClientEvent()
  Upgrade smoke test firefox 56.0 --> 56.0.2
  Upgrade Safari 11.0.0 --> 11.0.1
  Check versions before starting Karma
  Replace hard-coded client timeout with a constant
  Successfully use RealTimeServer.onOneClientEvent() in 'doesn't time out' test
  Attempt to use RealTimeServer.onOneClientEvent() in 'doesn't time out' test
  Add RealTimeServer.onOneClientEvent()
  Add test for RealTimeServer.getLastReceivedEvent() (not implemented yet)
  'Don't timeout test' no longer fails, but still needs work
  Don't timeout when pointer is moved (test 'works' but needs fixing)
  Beginnings of test to ensure timeout only occurs for inactive clients
  RealTimeServer times out specific clients
  Modify RealTimeServerTest.listenForOneEvent to take function arg
  Add promise-based way to listen for events in RealTimeServerTest
  First test on road to timing out inactive users
  Update Chrome Mobile version string in list of tested browsers
  Update karma 1.7.0 --> 1.7.1
  Update selenium-webdriver 3.5.0 --> 3.6.0
  Update send 0.15.4 --> 0.16.1
  Update mocha 3.5.0 --> 4.0.1
  Update lolex 2.1.2 --> 2.1.3
  Update eslint 4.4.1 --> 4.9.0
  Upgrade Node 8.2.1 --> 8.7.0