Work on #110; incorporate django-reversions for RichTextPage and Form models
change default ordering of revisions
ws issue
remove bad entry from local test; reorder mixin order
resolve merge conflicts
update target edit URL in conflict template
add context manager to disable concurrency during a revert, else you can never revert
Merge pull request #116 from mozilla/110-versioning

110: Incorporate django-reversions