Poi update (and removal of old Poi class)
Merge branch 'master' of github.com:mapzen/pelias

Conflicts:
	lib/pelias/poi.rb
	lib/pelias/suggestion.rb
	lib/pelias/tasks/openstreetmap.rake