add tap timeout
nameing error
Merge remote-tracking branch 'origin/master' into guardian

Conflicts:
	lib/fastclick.js
Merge pull request #334 from ftlabs/guardian

Add timeout to tap [mergeable PR]