Merge pull request #168 from mikej888/2013-07-bath

Updates to version control plus Chris's material