Remove mousetrap dependencies
Merge branch 'master' of https://github.com/snovakovic/puzzle.git