upgrade deps
upgrade conductor/oasis
Add magic new conductor footer.
Merge pull request #21 from hjdivad/upgrade_things

Add magic new conductor footer.
fixes for our updated libraries
update tests to work with new conductor.js
use the waitForLoad promise to simplify this test
Merge branch 'upgrade_things'