Merge branch 'master' of https://github.com/TIYA-Durham-GDI/GDI-rails-4 into Styling

Conflicts:
	app/views/locations/show.html.erb
	db/schema.rb
Merge branch 'Styling'
Fix geocoding in seeds.rb
Preen for presentation
Wire up bio images
Merge branch 'leaders'

Conflicts:
	app/views/locations/show.html.erb
Merge branch 'lateststyles'
seeded lat long state and location
incorperating master