Fix some versioning bugs.  Papertrail does not work well with associations