Remove some hopefully unneeded stuff and replace it with shortcuts; if something breaks, revert this commit :)
Merge branch 'master' of github.com:svenstaro/flamejam