stub out user_input search parsing helpers
create CityData migration for zipcodes, neighborhoods
create search helper, query methods
pulled in master
move city data module to its own helper file
add validations and tests for city data model
rspec tests for city data module
Merge branch 'master' into geo_search

Conflicts:
	db/schema.rb
rspec can't see tests unless filename ends with '_spec.rb'
add geocoder search method and json parsing method
commented out geocoder zipcode after_validation overwrite of field
passing tests for search by zip, address, neighborhood
update spot helper to add comments for clarity and saving data after changes
fixed whitespace at bottom of pages
fixed error where reservation was being instantiated (new), but not saved (hello create!)
update spot show view to reflect existence of reservations
added reservation update route
created controller for reservations for update path functionality
solve merge conflict
merge conflict