Switch to using fakeweb with vcr
Fix up spec broken after webmock switch