Merge pull request #51 from nakedible/upstream-fixes

Bunch of small cleanups and fixes
0.9.0 - fix tests
bind shift key to <crouch>