touch listener was not being removed properly.
touch listener was not being removed correctly
Merge branch 'master' into gh-pages
ran grunt on latest