MissionSt/Marlin — pull request #23 by rosenhouse (2014-07-01 18:31:00+00:00)
Title: fix travis build

@JoeMarino

these are, I think, the minimal changes necessary to get Travis to pass on the `YELLOW-P0023` branch. fyi.