Merge in Paperclip gem and model edits

Need to write proper tests for Paperclip