Merge branch 'master' of github.com:pelias/api into suggest_plus_mget
Merge branch 'suggest_plus_mget' of github.com:pelias/api into suggest_plus_mget