Update version number
Merge branch 'master' of github.com:okfn/ckan