Fix control labels

The WASD/arrow keys labels were switched.
Fix merge conflict with Carey's fix
Merge branch 'pR0Ps-master'