diff --git a/.travis.yml b/.travis.yml
index ed2b2e3b..e7030acf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,21 @@
-language: cpp
 dist: trusty
-sudo: required
+sudo: false
 os:
   - linux
-before_install:
-  - pushd ..
-  - wget http://downloads.arduino.cc/arduino-1.6.11-linux64.tar.xz
-  - tar xf arduino-1.6.11-linux64.tar.xz
-  - popd
 install:
-  - git clone --recurse-submodules https://github.com/keyboardio/Arduino-Boards hardware/keyboardio/avr
+  - git clone --depth 1 --recurse-submodules https://github.com/keyboardio/Arduino-Boards hardware/keyboardio/avr
 script:
-  - export DEFAULT_SKETCH=$(cd examples; basename *)
-  - export ARDUINO_PATH=$(pwd)/../arduino-1.6.11
-  - export BOARD_HARDWARE_PATH=$(pwd)/hardware
-  - hardware/keyboardio/avr/libraries/Kaleidoscope/tools/kaleidoscope-builder build
+  - make travis-test BOARD_HARDWARE_PATH=$(pwd)/hardware
+notifications:
+  irc:
+    channels:
+      - "chat.freenode.net#keyboardio"
+    use_notice: true
+    skip_join: true
+    template:
+      - "%{repository_name}/%{branch} %{commit} by %{author}: %{commit_subject} %{build_url} %{message}" 
+  email:
+    on_success: change
+    on_failure: change
+cache:
+  ccache: true
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..9ce0c4a9
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,12 @@
+# This stub makefile for a Kaleidoscope plugin pulls in 
+# all targets from the Kaleidoscope-Plugin library
+
+MAKEFILE_PREFIX=keyboardio/avr/libraries/Kaleidoscope-Plugin/build
+UNAME_S := $(shell uname -s)
+
+BOARD_HARDWARE_PATH ?= $(HOME)/Arduino/hardware
+ifeq ($(UNAME_S),Darwin)
+BOARD_HARDWARE_PATH ?= $(HOME)/Library/Arduino/hardware
+endif
+
+include $(BOARD_HARDWARE_PATH)/$(MAKEFILE_PREFIX)/*.mk