Merge branch 'chris'

Conflicts:
	app/views/seismic_index/index.html.erb
Small style fix
Merge branch 'chris'
Front page updates
Merge branch 'chris'