Set version to 1.6.0
Set version to 1.6.1-dev
Merge commit 'f47268f' into merge16fix

Conflicts:
	lib/iris/__init__.py
	setup.py