strike dip rake options
s, d, r kwargs in event2source
Merge branch 'sdr'

Conflicts:
	derec/core.py