Fixed issues merging with master
Merge branch 'master' of github.com:archaeogeek/QGIS-Gazetteer-Plugin