Adding versioning feature
Merging in changes from remote

Merge branch 'paper_trail'

* paper_trail:
  Adding versioning feature