Merge branch 'master' of https://github.com/sagemath/sagenb
Merge branch 'master' of https://github.com/sagemath/sagenb
Merge branch 'master' of https://github.com/sagemath/sagenb
Merge branch 'master' of https://github.com/sagemath/sagenb

necessary,
Merge branch 'master' of https://github.com/sagemath/sagenb
Merge branch 'master' of github.com:kcrisman/sagenb
Merge branch 'new_jmol' of https://github.com/vbraun/sagenb into vbraun-new_jmol
Merge branch 'new_jmol' of https://github.com/vbraun/sagenb into vbraun-new_jmol
Merge branch 'testjsmol' of https://github.com/kcrisman/sagenb into kcrisman-css
Final changes for CSS to work properly on introspection popout