updates for maps and drg drilldowny
fixes to merge conflictsy

Merge branch 'master' of https://github.com/pmreil/healthcosts

Conflicts:
	app/views/hospitals/show.html.erb
	app/views/layouts/application.html.erb