lyfeyaj/paper_trail — pull request #2 by NullVoxPopuli (2014-10-20 17:05:42+00:00)
Title: Merge with lyfeyaj

Update with papertrail master and resolve the 3 conflicts.