guard/guard — pull request #414 by aspiers (2013-04-04 13:46:40+00:00)
Title: misc fixes

This should get Travis builds working again, and fixes a few other things.
Please don't merge until the Travis build for the pull request is green.