Merge pull request #56 from tildeio/update-oasis

Upgrade Oasis.
Upgrade Oasis to master (post 0.2.1).
Configure oasis to allow same origin in tests.

This is a temporary measure.  We should fix the test environment in conductor so
it matches that in oasis: ie that it forces cards to run in different origins
that we might properly test browsers that depend on this for sandboxing (such as
ie8 and ie9).
CardReference.promise replaced with `waitForLoad`.

`card.promise.then(doSomething)` → `card.waitForLoad().then(doSomething)`
Card.promise replaced with `waitForActivation`.

```js
  Conductor.card({ /*...*/ }).
    waitForActivation().
    then(doSomething, handleErrors);
```