bundle update
fix tests
YAYNETWORKSTATUS
- renamed Asset.basename to Asset.name
- added "adoption" of previous GeoTag places by geoname_id, to reduce churn from GeoName and OSM name changes
- fixed tests and reduced Settings hits to be lazy
fix tests to pass even in southern hemispheres (!)
fixed path to geonames gem
Merge branch 'master' of github.com:mceachen/chromotype

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/geo_tag.rb
	app/models/setting.rb
	db/migrate/20110526005214_create_assets_tags.rb