version model tests
resolve merge conflicts
ancestors/branch methods tested and refactored
Merge pull request #12 from petebrooks/version-show

Version show