diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 987e2a2..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-composer.lock
-vendor
diff --git a/.travis.yml b/.travis.yml
index 11ab0f5..70a6fed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,16 @@
 language: php
-dist: trusty
-sudo: required
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+  - hhvm-nightly
 
 matrix:
-  include:
-    - php: 5.3
-      dist: precise
-    - php: 5.4
-    - php: 5.5
-    - php: 5.6
-    - php: 7.0
-    - php: 7.1
+  allow_failures:
+    - php: hhvm-nightly
 
 install:
   - composer install
@@ -20,8 +20,7 @@ before_script:
   - cd tests
 
 script:
-  - phpunit --colors --coverage-clover ../build/logs/clover.xml .
+  - phpunit --colors --coverage-clover /home/travis/build/joshtronic/php-googleplaces/build/logs/clover.xml .
 
 after_success:
-  - cd ..
-  - php vendor/bin/coveralls --config .coveralls.yml -v
+  - php ../vendor/bin/coveralls --config ../.coveralls.yml -v
diff --git a/FUNDING.yml b/FUNDING.yml
new file mode 100644
index 0000000..9396c28
--- /dev/null
+++ b/FUNDING.yml
@@ -0,0 +1 @@
+github: joshtronic
diff --git a/README.md b/README.md
index c95972d..9e2a217 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,14 @@
 # php-googleplaces
 
-[![Build Status](https://travis-ci.org/joshtronic/php-googleplaces.svg?branch=master)](https://travis-ci.org/joshtronic/php-googleplaces)
-[![Coverage Status](https://coveralls.io/repos/github/joshtronic/php-googleplaces/badge.svg?branch=master)](https://coveralls.io/github/joshtronic/php-googleplaces?branch=master)
-[![Total Downloads](https://poser.pugx.org/joshtronic/php-googleplaces/downloads)](https://packagist.org/packages/joshtronic/php-googleplaces)
+[![Build Status](http://img.shields.io/travis/joshtronic/php-googleplaces.svg?style=flat)][travis]
+[![Coverage Status](http://img.shields.io/coveralls/joshtronic/php-googleplaces.svg?style=flat)][coveralls]
+[![Downloads](http://img.shields.io/packagist/dm/joshtronic/php-googleplaces.svg?style=flat)][packagist]
+[![Gittip](http://img.shields.io/gittip/joshtronic.svg?style=flat)][gittip]
+
+[travis]:    http://travis-ci.org/joshtronic/php-googleplaces
+[coveralls]: https://coveralls.io/r/joshtronic/php-googleplaces
+[packagist]: https://packagist.org/packages/joshtronic/php-googleplaces
+[gittip]:    https://www.gittip.com/joshtronic/
 
 PHP Wrapper for the Google Places API.
 
diff --git a/composer.json b/composer.json
index 68ed572..148b173 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "satooshi/php-coveralls": "1.0.*"
+        "satooshi/php-coveralls": "dev-master"
     },
     "autoload": {
         "psr-4": {"joshtronic\\": "src/"}
diff --git a/tests/GooglePlacesTest.php b/tests/GooglePlacesTest.php
index 241aeea..2d0b401 100644
--- a/tests/GooglePlacesTest.php
+++ b/tests/GooglePlacesTest.php
@@ -3,10 +3,6 @@
 require_once '../src/GooglePlaces.php';
 require_once '../src/GooglePlacesClient.php';
 
-if (!class_exists('\PHPUnit_Framework_TestCase') && class_exists('\PHPUnit\Framework\TestCase')) {
-    class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase');
-}
-
 class GooglePlacesTest extends PHPUnit_Framework_TestCase
 {
     private $places;
@@ -19,11 +15,7 @@ class GooglePlacesTest extends PHPUnit_Framework_TestCase
 
     private function clientSetUp($next = false)
     {
-        if (version_compare(PHPUnit_Runner_Version::id(), '5.4', '<=')) {
-            $client = $this->getMock('GooglePlacesClient', array('get'));
-        } else {
-            $client = $this->createMock('GooglePlacesClient');
-        }
+        $client = $this->getMock('GooglePlacesClient', array('get'));
 
         $client
             ->expects($this->once())