Add crossfade
Remove code changes.  Replace with test/doc fix for cross_fade
Merge remote-tracking branch 'upstream/master' into crossfade

Conflicts:
	unittest/test_core.py
Merge pull request #215 from dajobe/crossfade

Document cross_fade property and add test for it