Merge branch 'sed-flux-dep'

Conflicts:
	landlab/plot/video_out.py -> Now resolved.