fixed issues with paperclip files
Merge http://github.com/enylund/project1