updated paperclip call to visual image so that datestamp is not in url (not cached)
fixed merge errors