Removing Object.defineProperty call from plugin as well.  Per https://github.com/openannotation/annotator/pull/412
Replacing chai with assertive-chai.
chai does not support older versions of IE.  Note that assertive-chai requires a different assert package than the one available via npm.
Merge branch 'master' into grunt-test
Replacing window.hasOwnProperty in bootstrap.js
Relates to https://github.com/openannotation/annotator/issues/420
It's weird seeing semicolons again.
Merge branch 'master' into grunt-test