Merge branch 'master' of https://github.com/brey/BOUT-dev

Conflicts:
	examples/non-local_1d/analyse_slicer