Upgrade Conductor/Oasis

specifically: https://github.com/tildeio/conductor.js/commit/fe929d44bc92631d488523c78013b34d7487a08b
Which gives us:
- proper request rejection propagation
- improve request handle API
disable the height service within glazier rather then patching conductor
begin restoring assertion service
Merge branch 'master' into upgrade_conductor

Conflicts:
	app/services/identity.js
	app/services/repository.js
	cards/github-stars/test/container_test.js
update RSVP
Fix tests + re-enable assertion service

- inCard no longer provides a resolver argument,
rather follows the "return a promise" pattern
- inCard now attaches a default rejection handler,
which pretty prints the error, and causes a qunit test failure.