Reduce threading time limit slightly.

It's better to have one test fail, than Travis kill the whole thing and
miss some other errors.
fix taper decorator (fixes #878)
Merge branch 'releases'

Conflicts:
	obspy/core/util/decorator.py