Merge rspec tagging, opera proxying et al