Add keyboard bindings, controller buttons
Merge branch 'master' of https://github.com/cavedweller/massplay