Merge branch 'master' of https://github.com/drewm/mailchimp-api

# Conflicts:
#	composer.json

Author: drewm

tests/BatchTest.php

@@ -30,4 +30,4 @@ public function testNewBatch()
         $this->assertInstanceOf('DrewM\MailChimp\Batch', $Batch);
     }
 
-}
+}

tests/ListsTest.php

@@ -30,4 +30,4 @@ public function testGetLists()
         $this->assertArrayHasKey('lists', $lists);
     }
 
-}
+}