WIP: trying to get rspec going for endpoints. fixing carrierwave...
merging conflicts