diff --git a/.travis.yml b/.travis.yml
index b377b68..260b871 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,8 @@
 language: go
 go:
-- 1.6
 - 1.7
 - 1.8
 - 1.9
 - tip
-before_script:
-- go get -u github.com/alecthomas/gometalinter
-- gometalinter --install
 script:
-- diff -u <(echo -n) <(gofmt -d -s .)
-- gometalinter --disable=golint ./...
-- go test -cover -bench=. -v -race ./...
-notifications:
-  hipchat:
-    rooms:
-      secure: Tk19TNeLNQKRCGC5NKFEqCQTJsEJNrfZ56iuiA5iavIYVoTsX6Pi9VxvzYOeXNNuuHEF9yC3bnv9+yjNaBps7S+T/EiT1F7Qx4BIVgmETK+qg82XmFz5p8lWn7GmSZVWu2kBVlVMbtEdsYPbR19v1LvzSw2U9SO7j7CssWVyAmY=
-    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/%{repository}/commits/%{commit}">View on GitHub</a>'
-    format: html
-
+- make test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2aeced1..7112d98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,8 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [0.6.0] - 2018-06-04
+[2018-06-04] Version 0.6.0
+--------------------------
 ### Added
 - PR [#24](https://github.com/sendgrid/smtpapi-go/pull/24): Added Code of Conduct. Big thanks to [Shivam Agarwal](https://github.com/gr8shivam) for the PR!
 - PR [#26](https://github.com/sendgrid/smtpapi-go/pull/26): Added TROUBLESHOOTING.md. Big thanks to [Callam Delaney](https://github.com/cal97g) for the PR!
diff --git a/LICENSE.txt b/LICENSE.txt
index 7756fd6..d55059a 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2018 SendGrid, Inc.
+Copyright (c) 2013-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..62c94e6
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,8 @@
+.PHONY: test install
+
+install:
+	go get -t -v ./...
+
+test: install
+	diff -u <(echo -n) <(gofmt -d -s .)
+	go test -cover -bench=. -v -race ./...
\ No newline at end of file