Bug 890952 - Removed some stale waffle calls.
Merge branch 'master' into bug890952-cleanup-waffle
Prevent normal scroll when up or down is keyed
Adding Moustrap to the project to aid with key commands
Merge pull request #1211 from jezdez/bug890952-cleanup-waffle

Bug 890952 - Removed some stale waffle calls.
Merge pull request #1206 from darkwing/search-keypress

Adding Moustrap to the project to aid with key commands