Merge branch 'anross-master'

* Merge devel ready for 1.1.1 release
Fixed version/changelog mismatch
Merge branch 'master' into devel

Conflicts:
	redhat/obix.spec
Merge branch 'devel'

* Bringing in updated specfile