Merge pull request #42 from zenoss/release/1.1.4

New release version
bump revision
Merge pull request #43 from zenoss/master

Master
Merge pull request #44 from zenoss/master

reset revision
Merge branch 'release/1.1.4'