Merge branch 'master' of https://github.com/buildbotics/machine-controller
authorDoug Coffland <dougcoffland@gmail.com>
Wed, 10 Feb 2016 00:47:38 +0000 (16:47 -0800)
committerDoug Coffland <dougcoffland@gmail.com>
Wed, 10 Feb 2016 00:47:38 +0000 (16:47 -0800)

Trivial merge