added carrierwave uploader
merged some code
updated readme