Removing the obsolete gitflowversion variables
Fix broken test
Merge pull request #169 from Particular/variable-cleanup

Variable cleanup