Bump to 2.1.1
Temporarily remove Google Search option until v2.2.0
Merge branch 'master' into v2.2.0
Bump to 2.2.0
add back google search option for development