[DO NOT MERGE]: maybe fix crossed keybindings in ipython 4.1#6053

tacaswell wants to merge 2 commits into

matplotlib:v1.5.xmatplotlib/matplotlib:v1.5.xfrom

tacaswell:fix_js_nbagg_focustacaswell/matplotlib:fix_js_nbagg_focusCopy head branch name to clipboard