Merge pull request #1 from agusmba/master

Keep previous version (unless on master) and update to python 3.
Introduce config variable to always revert project version

Introduces the new configuration variable
merge.pommerge.keepmasterversion
If set to true, the project version will always be reverted
even on master branch.