#1 merge to ObsPy branch

Still missing the obspy from original file and obspy to petrel sections.