Removed more item_type clashes
Image factory data now points to real images in Cloudinary
Bump ruby version to 2.1.5
Bump travis tests to ruby 2.1.5
Merge branch 'master' of github.com:crossroads/api.goodcity into gogovan-booking-feature
Merge branch 'gogovan-booking-feature' of github.com:crossroads/api.goodcity into gogovan-booking-feature