Rename disconnected event to network-error for clarity
Merge branch 'master' into disconnected-rename
Merge pull request #320 from dmose/disconnected-rename

Rename disconnected event to network-error event for clarity