some more organisation
Merge branch 'master' of https://github.com/horizon-institute/vicarious

Conflicts:
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/__init__.py
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/_run_server.py
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/config.py
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/main.py
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/pubnub_pulse_sender.py
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/pubnub_sine_sender.py
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/scripts/run_pulse_sender
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/scripts/run_server
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/scripts/run_sine_sender
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/static/css/style.css
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/static/fonts/UbuntuMono-R.ttf
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/static/hello.html
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/static/index.html
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/static/js/Detector.js
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/static/js/excanvas.js
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/static/js/gl_renderer.js
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/static/js/jquery-1.6.1.min.js
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/static/js/jquery.flot.js
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/static/js/pubnub_gl.js
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/static/js/pubnubbuffer.js
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/static/js/three.js
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/static/js/three.min.js
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/static/js/tween.min.js
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/static/js/vicarious-probe.js
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/templates/channel.html
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/templates/channel_webgl.html
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/templates/layout.html
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/ui.py
	Vicarious/Vicarious/ClientLibraries/js/example/css/style.css
	Vicarious/Vicarious/ClientLibraries/js/example/fonts/UbuntuMono-R.ttf
	Vicarious/Vicarious/ClientLibraries/js/example/js/jquery-1.6.1.min.js
	Vicarious/Vicarious/ClientLibraries/js/example/js/jquery.flot.js
	Vicarious/Vicarious/ClientLibraries/js/example/js/pubnubbuffer.js
	Vicarious/Vicarious/ClientLibraries/js/example/js/vicarious-probe.js
	Vicarious/Vicarious/Gateways/pubnub/sine_sender/pubnub_sine_sender.py
	Vicarious/Vicarious/pubnub/pubnub_sine_sender.py
	Vicarious/Vicarious/pubnub/static/css/style.css
	Vicarious/Vicarious/pubnub/static/fonts/UbuntuMono-R.ttf
	Vicarious/Vicarious/pubnub/static/hello.html
	Vicarious/Vicarious/pubnub/static/index.html
	Vicarious/Vicarious/pubnub/static/js/excanvas.js
	Vicarious/Vicarious/pubnub/static/js/jquery-1.6.1.min.js
	Vicarious/Vicarious/pubnub/static/js/jquery.flot.js
	Vicarious/Vicarious/pubnub/static/js/pubnubbuffer.js
	Vicarious/Vicarious/pubnub/static/js/vicarious-probe.js
	Vicarious/Vicarious/pubnub/templates/layout.html
	legacy/wsgateway/static/hello.html
	legacy/wsgateway/static/index.html
	legacy/wsgateway/static/js/excanvas.js
	legacy/wsgateway/templates/layout.html
arduino node stuff
Merge branch 'master' of https://github.com/horizon-institute/vicarious

Conflicts:
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/static/js/pubnubbuffer.js
	Vicarious/Vicarious/ClientLibraries/Javascript/pubnub/static/js/vicarious-probe.js
	Vicarious/Vicarious/ClientLibraries/js/example/index.html
	Vicarious/Vicarious/ClientLibraries/js/example/js/example.js
	Vicarious/Vicarious/ClientLibraries/js/example/js/vicarious-probe.js
	Vicarious/Vicarious/ClientLibraries/js/pubnubbuffer.js
	Vicarious/Vicarious/ClientLibraries/js/with_callbacks/pubnub_buffer_cb.js