Map Cmd-n, Cmd-Shift-n to New Tab and New Window