fixed bug in version update processes
fixed merge conflict
fix version issue
Merge branch 'master' of https://github.com/jfwood/keep