Use webmock instead of fakeweb for VCR; Fix tests; Use Timecop to speed up tests previously using sleep; Move artist rename into seperate operation

Gemfile.lock

@@ -53,6 +53,7 @@ GEM
     activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    addressable (2.3.4)
     arel (3.0.2)
     awesome_print (1.1.0)
     aws-s3 (0.6.3)
@@ -73,6 +74,7 @@ GEM
       capistrano
     chronic (0.9.1)
     coderay (1.0.9)
+    crack (0.3.2)
     daemons (1.1.9)
     delayed_job (3.0.5)
       activesupport (~> 3.0)
@@ -87,7 +89,6 @@ GEM
       multi_json (~> 1.0)
     factory_girl (4.2.0)
       activesupport (>= 3.0.0)
-    fakeweb (1.3.0)
     highline (1.6.18)
     hike (1.2.1)
     i18n (0.6.4)
@@ -184,6 +185,7 @@ GEM
       ref
     thor (0.18.1)
     tilt (1.3.6)
+    timecop (0.6.1)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
@@ -199,6 +201,9 @@ GEM
       rack
       raindrops (~> 0.7)
     vcr (2.4.0)
+    webmock (1.11.0)
+      addressable (>= 2.2.7)
+      crack (>= 0.3.2)
     webrobots (0.1.1)
     whenever (0.8.2)
       activesupport (>= 2.3.4)
@@ -218,7 +223,6 @@ DEPENDENCIES
   delayed_job_active_record
   diff-lcs
   factory_girl
-  fakeweb
   ffaker!
   mechanize!
   memcache-client
@@ -239,7 +243,9 @@ DEPENDENCIES
   simplecov
   term-ansicolor
   therubyracer
+  timecop
   uglifier (>= 1.0.3)
   unicorn
   vcr
+  webmock
   whenever