Added seismic (again, sorry)
Merge branch 'master' of https://github.com/jfoshee/rockhack