fixed some bugs (according to IDE)
These snippets were marked as erroneous.
xfade was unused
Merge branch 'master' of git://github.com/HerrMuellerluedenscheid/pyrocko into HerrMuellerluedenscheid-master

Conflicts:
	pyrocko/trace.py