Merge branch 'master' of github.com:buildbotics/machine-controller
authorJoseph Coffland <joseph@cauldrondevelopment.com>
Sun, 6 Sep 2015 22:17:43 +0000 (15:17 -0700)
committerJoseph Coffland <joseph@cauldrondevelopment.com>
Sun, 6 Sep 2015 22:17:43 +0000 (15:17 -0700)

Trivial merge