skip some tests cleaner
add option to disable automerge for obspy-plot
Merge remote-tracking branch 'upstream/master' into evalresp_parser

Conflicts:
	obspy/core/tests/test_stream.py