Added video driver and updated adaptor to handle both camera and video.
Fix tests to pass with latest video changes.
Merge branch 'master' into videofeed-upd

Conflicts:
	lib/adaptor.js
	lib/camera.js
	spec/lib/adaptor.spec.js
	spec/lib/camera.spec.js
Fixes issues that came up in merge with connection and upd new video driver
Fix broken spec
Merge pull request #15 from hybridgroup/videofeed-upd

Adds video feed support along with camera changes small fixes and cleanup.