Allow xray to be revealed with ctrl+shift+x
Merge remote branch 'upstream/master' into shortcut-keys

Conflicts:
	README.md
Change keyboard shortcuts, it is now cmd+shift+x on a Mac, ctrl+shift+x otherwise
Conditional for shortcut in initial console.log
README edits for shortcuts