Update amenities, add rentals_amenities
Clean up URLs in cassettes and specs