Tidy up the changelog
Merge branch 'anross-master'

* Merge devel ready for 1.1.1 release
Merge branch 'master' into devel

Conflicts:
	redhat/obix.spec