AUI-841

Hi Jon. I was wondering if you could review this before we send the final pull request to Nate. Scroll on touch and mouse seem to all work nicely. Let us know what you think. Thanks ^^