Merge branch 'merge' into TJ
Ignore the motionwiki dom objects now in the minimap
Mapped the play/pause/skip controls to the keyboard
Merge branch 'TJ' into matt