Expose web-socket API.
Merge pull request #1082 from Gozala/hotfix/path

Pull latest changes for path module from nodejs. a=@gozala
Commit.
Revert again node broke path :(
Bug 891109 - add 'before' and 'after' to test harness
Merge pull request #1085 from jsantell/add-before-after-test-harness

Bug 891109 - add 'before' and 'after' to test harness, r+=@erikvold
Bug 890087 use history observer for removal of places data to fix orange tests
Merge pull request #1087 from jsantell/fix-history-tests

Bug 890087 use history observer for removal of places data to fix orange tests, r+=@erikvold
Fix failures on windows.
Merge remote-tracking branch 'upstream/master' into hotfix/io

Conflicts:
	lib/sdk/io/fs.js
	lib/sdk/io/stream.js
	test/test-net-ping-pong.js