Re-factored the way Paperclip is included