Merge remote-tracking branch 'upstream/master'
Added proxy support to zcollective
Bumped up version number
resolve merge conflicts