Added new test scenario showing issue in #296
Removed ShortVersion and ShortVersionParser. It limits flexibility when switching to GitVersion
Merge pull request #308 from JakeGinnivan/BetterSwitchingToGitFlowStory

Better switching to git flow story