Merge pull request #3 from themattchan/b_matt

B matt
changed to tap events for accel
resolved merge errors from tap handler
just cleaning code
merp