diff --git a/.travis.yml b/.travis.yml
index b61d8af5..e7030acf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,11 @@
-language: c
-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
+dist: trusty
+sudo: false
+os:
+  - linux
 install:
-- pushd ..
-- mkdir -p arduino-local/hardware/keyboardio
-- git clone https://github.com/keyboardio/Arduino-Boards arduino-local/hardware/keyboardio/avr
-- cd arduino-local/hardware/keyboardio/avr
-- git submodule sync --recursive
-- git submodule update --init --recursive
-- popd
+  - git clone --depth 1 --recurse-submodules https://github.com/keyboardio/Arduino-Boards hardware/keyboardio/avr
 script:
-- make ARDUINO_PATH=../arduino-1.6.11 ARDUINO_LOCAL_LIB_PATH=../arduino-local build-all
+  - make travis-test BOARD_HARDWARE_PATH=$(pwd)/hardware
 notifications:
   irc:
     channels:
@@ -25,7 +17,5 @@ notifications:
   email:
     on_success: change
     on_failure: change
-  slack:
-    secure: geVAHVhYQ5bY7ja5vx1Tgxc5y64WLuXVEWKmw4LqiThFYCjtpdWkHGiZJfhUwkVI11u5w8w1FUmrB7ZP4EUGoXhCK/z1mvVMVJ9+fS+WoaqcTHFJi0hGbvXaFPD7QA+ef7TLrFcU643kf6KHN/P+dVVndLyhctXZqOZHHwXmKZNMt8qM5Gh5h41HOi0YjT9yFafSU0qf5jphF5qvjlxKsVJF+WxtMSU4xMYxzq7rf80bPi2pu4ijgqR5+Haaa71DJ1V2TA4wZ+BFTBo2YUJIGZ8qDlqmb7RdF/u72G/8HbT/Hzj55blrpBXU/BPkokGOPJlIGHPV76ESpJI0ZUILRifmkZY6ylMjl/hutDYPNjhMq8Z/UKSLN6pJQAq0PjqAoHCtPsXTbRMT0lhVt2itkCPwAXVgszTrE6INsNylY/soaDu66Sjmz2zQH8sC6hbL8SrZ0xGs1Q+e3q5WMETPIAS9f4n2YCxkIz4ORoL9IrOXUcebVNriiWKzOBt6bleWPJlGc6yVYkkUhvURH+jEp6v2Y5SqsaJVTD3I5Gq/H/0PJBtPdzu470yQ3/FD4g6M0AmWx8DCuvl1O295QOZbUtujpIowTm7PynFrAgW3ptSidjzWjzZaHc0iQJBiNi86dg3GomoEEOPzx8hnX7fhFgsR+Ixqfzx0srrQYqleQGY=
 cache:
   ccache: true
diff --git a/Makefile b/Makefile
index e73d34f0..9ce0c4a9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,12 @@
-# default action for `make` is `build`
-build:
+# This stub makefile for a Kaleidoscope plugin pulls in 
+# all targets from the Kaleidoscope-Plugin library
 
-astyle:
-		find . -type f -name \*.cpp |xargs -n 1 astyle --style=google
-		find . -type f -name \*.ino |xargs -n 1 astyle --style=google
-		find . -type f -name \*.h |xargs -n 1 astyle --style=google
+MAKEFILE_PREFIX=keyboardio/avr/libraries/Kaleidoscope-Plugin/build
+UNAME_S := $(shell uname -s)
 
-%:
-	@tools/kaleidoscope-builder $@
+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