Revert "flipped keyboard to joystick mapping so that wasd works as expected"

This reverts commit 0a44ca4244bf061f0886744392eecb6e662ebdb8.
Revert "Revert "flipped keyboard to joystick mapping so that wasd works as expected""

This reverts commit 7b9f29d220fc03b066763c025edfb92635f03802.