Merge branch 'master' of https://github.com/tinysou/tinysou-search.js

Conflicts:
	src/jquery.tinysou.js