Merge branch 'master' into sed-flux-dep

Conflicts:
	.gitignore
	landlab/plot/video_out.py
Weird html deletions