diff --git a/.travis.yml b/.travis.yml
index ca577d8..6745644 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@ python:
 - '3.4'
 - '3.5'
 - '3.6'
-# Enable 3.7 without globally enabling sudo and dist: xenial for other build jobs
 matrix:
   include:
   - python: 3.7
@@ -14,41 +13,26 @@ matrix:
     sudo: true
 fail_fast: true
 before_install:
-- pip install pycodestyle
+- pip install pycodestyle coverage codecov
 - if [[ "$TRAVIS_PYTHON_VERSION" == 2.7* ]]; then pip install mock; fi
 install:
-- pip install codecov
-- travis_retry pip install coverage
-- python setup.py install
-- pip install codecov
+- pip install virtualenv --upgrade
+- make install
+- make test-install
 script:
-- pycodestyle
+- pycodestyle --exclude=venv
 - coverage run -m unittest discover
 after_script:
 - codecov
-- python -m unittest discover
+- make test
 - coverage run tests/test_unit.py
-notifications:
-  hipchat:
-    rooms:
-      secure: HJMoEh7l01B8tqQcdp4c4Og2lFY2QCAPnt++a4InM1zF+pbQuALQvS50ILJPc7qoBskqfvXhX9t+coSaKVIMPFuXlHC9haYCBxv0TSTA/j/9SnDGwS70U2YWDIi20/YZrPSN874woL6F/D8/vB+IwYxJWIL+ofasXPm/v+QHKLjEKLggyK8SHsU2BPH++0JluelpnaBt6JcCCY6IL8wu/Bf6ohFHf67cwITPzA33Wmla51W5zHSlaVsqKM+UhK5EWCCvU51t/imfL8cf8h7zNxveqGbaq5Fqk7lBEmHtYdUm0P5RdsHHFiyWvf3Kk8kYBkA4VaSqSdV10g/Q2sURW0F4s6ULJqRBtTIcQFKgUcrkBM22+/I8MrfRkVOUrrlPugOeshtuac3xN0tQBZYc1yIik914NeL1im/doZ5MjsNlQckmF8tmwz9uPMpQBWHRGQwc72EiJ3ANfogMhZhI3GIKQffHP8aO+JTCyzzxQ1fUerF4/YgsciAZdbBRVKmYdElvix6vVxS1QyPEjr3AHzhCFso78vRla7yAXoI2RrzbsnoPo/TBsof4sqbtgPgGWSBPJiZOPh3WNZ5NSUjlefk1PyYsdqM+Ywhk8SApo8eKrDK2ghiKmqSB3yDIs4WJN91CJnhUgt8fl5Q2Iz1pCm/999ma+y/VXOqURudE5wg=
-    template:
-    - '<a href="https://travis-ci.org/%{repository}/builds/%{build_id}">%{repository}
-      Build %{build_number}</a> on branch <i>%{branch}</i> by %{author}: <strong>%{message}</strong>
-      <a href="https://github.com/sendgrid/%{repository}/commits/%{commit}">View on
-      GitHub</a>'
-    format: html
 after_success:
 - codecov
-env:
-  global:
-  - secure: 7j0Ox9ZQss0PewrhGih86Ro0pQJpv23Bb0uABJV7kKN/W37ofrG0m6joamf8EhDDleaPoIqfbARhUpAlqFZF0Uo/5rREqpKkmP4e1zuYMu20VbFv6PXwZ+7ByAuKXN2/Xs54MImlL1+RaduMPNRpbcfT1mdqJgSC+3tVcWodzuRG9RPzxtWYLe93QfwNHV/VMsDPDIY12FZTErbXd/hBCEQXep5rNfK+TtLIGn0ZnS7TktTcD0ld+0ruhunbDjnkpXPVSJDuLaGRpotq0oyaGifnjVM5gVubP+KCL3h24tIXjJ7uI36Eu3EuF4qsg0fmNjuM/WjgwZ9Ta4I2MHlXtFs//qMMArOw5AvPg25adrEwGO4Veh3I3tJGL7hJeM7AZX4rAycXiGIHvpP2G/nX6e/EqRrnFBDOStmBhxEaknLJ/p2Cv6AOvxTMKDo8y+tJY1jp3H1iwCBYyW6KuFKVPDYtu8VLxJunaqNX4LxiJN7VHgvTSgqImjzEy5tVxVt079ciyeznSKKGHLHDAl1ioQpmv/Oyas007A4PKJJAf73go8Yt+GM6qe3K6U3tIBKWL8e0cK1kejk9TLC0D9KXbmhmK81QzpBdQfkrveYi/kucVv0zdrGl+Uy8zcq+vYxceyCdDYcTxCS66bWNFTD2t1dML5gRpdNVVSc27ZM9wtA=
-  - secure: NlSZq/v2vjPQSSjlAbrM1JAfCdBSF/OqmO1HV/7U8HAmyGj7WjAcBkH5qWb5lP/xgUSzP3rEtNBJQNNHHiHHxSY0TtplUkJHrBqZOWGd4nG4GB/w8thj4nOiuok9lQhU2wi4mhRnzw2gGG9XpRpnYqL3a0CWWZ8XilSdL3M1H4fE2rwCSbKo35wpaapAT2BkN/zXeJ62wYX0vsz14EAzRSPlX+zfSo4esjig/B4ubgD1KKq3vRWGX0oU1/b6LYxrRl+OPqql9s3nKa0SuHtzLH4CVM0JTpJ8PxYq/LaLn03evAtgjR3aJJUlXaYL+yVBdATGrtyGUAJTVvRtbWsiaW4KNs+e5eWD+KM1ei18DYHWTMsjRbKLh3DrnUxFSFezMkOgUX4I9aohqPW9q9eTbSi2nR2mEcfDrGPArTZKtmGvx09gil5BAvsYc9A2Ob+TdV0N/bHROdK1R381mY4xWYytZ070+J4YHIKi/AwEJXtYgedc/PDr6fxh9RKDXNybyP2y/i+b72bnij9ZyJc0scDAlRQ4MU/h4cFDohI9quIYpJZ3N3eUeVp7TNX4AT2z+aNj74pBy15eMJv8WYhuBauk3jexhpMQi5yDr7aqlb2/NRyd91oP5QZOcjo7nnPcJp8QyvKtWFeID+c5dV3wcIMeOXmPz1KWWGlJMrV1vZI=
 deploy:
   provider: pypi
-  user: thinkingserious
+  user: __token__
   password:
-    secure: LICjgQDHDZUYFbhrxd/4KGlamfMPMu7Oqf7DCskfJwQqvZTrC7VyvOsPqVtCIIpw/GyE606KagkTEV7nTvwxCWGDQpQ0gkLkUkDzxziJlwKJEjYA3rGzxHCqdGRF6mQLThIpaUwaIpM7Ue4LUyhMSNw7b84F/dg1gWzK+LuqzY6UIRUmu6O2XvwoCWnbmrDrqExgOB7oyBABqlhmISr5x8JeMH+HRSTaHQW0QWeckEYUBPlSdXa4lj1pMfaRIlU3r7vB0Tckh5wtgu/B0t5I7enrdYHxaqIVCsh65c/8pDxXpI7anRCrPFU3SEGbodfe6rtNY4WlhWKaTJIPpQbKFU/NyYIjbox6rhdJ/bbC7hMfAxqTWzp1urJQxdWd5cbDUwNWgukdP5KhWA+iqy35llfb2KlFG6AVKHy4iR93is8hGW2NwCsSlx18W82AqpARJA22TWEIbKbyy6+GoiiIEmXxWleqriTqLuTLpPjyAby4pcW5gqtjVzEJ7Gi+Eq+Ex0pMUdOpXIt3kIk8TAB2chlGWr7+j9GuDN89LY0brSM+Q0fP8X3gohVQI5Afl8A+5ygQW5l//y2dakZ0KLSj6JjSyWMWMahrPHpxdUeNKjfENscU00AJSrskoAJvU1N4oyLIABrA7oMG5ZJXpASsixBimypayCCPJe50p+tEWW4=
+    secure: pFkY2d3epVf8qqJrlr/jtX+ssB1R5xHVhxpncKedCD9m837jtXn4Kz+tfhGUmPgg6SQm5x+uchDJZ7i8BPHTsDhXgz7OZ+O/iDOVNLY8aZHoo/slBeruxqXRFo6oYY+E8ISlLQWqteENAbZ4u5qDTEqjg3PS2EnPda2pXC79R0XRwlr7zGoyhDj6G2uqutPU4fbWJ4O5TYaXiC01eDthpu4Z2jqirBg7AdIQp3uAj85DrVDmmb1v9S2cgx0vHhdSWlebCmyxt8uY/iszC3tOK4ekB6af1u6m6fxLEM5ozhZq0JXoSg4FlqBlv9CC2/QRvemPQo7cZPhvHmbTEFjTPoM5tuBgfOmamWJFLd25saw1zQ6UxfOhNEDnitr7uy63kPi9mvmq0gXjWECf0G+N9wIuLO/WcDOp4PkIoPHsH5h2EqLul3xvu9CXQ6pOeMd3Co2JKtdaVVJcAHiq0l5mlxn8Q403meYt/qlBWR6O5ze2LU3ib3uu441DtqtLulYeWk6zknPP6i7yixTzRxGghtvLoBC+77f6nSdjNljV8ajcNSCZe+6QXQHCZYWhcgQTs6Y/Y8lq4EeN5Zlywzpr/3LkraRrCIk6+Qn94OOx+4Hn2IZqBhg01C5vs2OK0a9/hnsxsEr7C/3nHPbfFfrKl/6kKjPTLLk+NlpPKVioEQY=
   on:
     branch: master
     condition: "$TRAVIS_TEST_RESULT = 0"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea58530..0c37f8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,9 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [3.2.0] - 2019-09-11
+[2019-09-11] Version 3.2.0
+---------------------------
+
 ### Added
 - [PR #91](https://github.com/sendgrid/python-http-client/pull/91): Add support for Python 3.7. Thanks, [Hugo van Kemenade](https://github.com/hugovk)!
 - [PR #96](https://github.com/sendgrid/python-http-client/pull/96): Create a use cases directory. Thanks, [
@@ -137,4 +139,4 @@ Nathan Seebarran](https://github.com/nathan78906)!
 
 ## [1.0.0] - 2016-02-25
 ### Added
-- We are live!
\ No newline at end of file
+- We are live!
diff --git a/LICENSE.txt b/LICENSE.txt
index e0a10ef..41d0f7e 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2012 - 2019 Twilio SendGrid, Inc.
+Copyright (c) 2012 - 2020 Twilio SendGrid, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..9a9a676
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,17 @@
+.PHONY: venv install test-install test clean nopyc
+
+venv:
+	@python --version || (echo "Python is not installed, please install Python 2 or Python 3"; exit 1);
+	virtualenv --python=python venv
+
+install: venv
+	. venv/bin/activate; pip install -r requirements.txt
+
+test:
+	. venv/bin/activate; python -m unittest discover -v
+
+clean: nopyc
+	rm -rf venv
+
+nopyc:
+	find . -name \*.pyc -delete
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..932a895
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1 @@
+mock
diff --git a/setup.py b/setup.py
index cab04ab..530ecc5 100755
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@
     include_package_data=True,
     license='MIT',
     description='HTTP REST client, simplified for Python',
-    long_description_content_type = 'text/x-rst',
+    long_description_content_type='text/x-rst',
     long_description=readme,
     keywords=[
         'REST',