fixed bugs in new clone
fixed conflicts from tim's update locally
merging tim's update to paperclip locally