Syncing a somehow modified test file
Merge branch 'master' of https://github.com/landlab/landlab

Conflicts:
	landlab/test.pdf