carlhuda/bundler — pull request #2280 by databus23 (2013-01-28 23:32:43+00:00)
Title: Fix tests on master

These changes fix all tests for me on OSX. Let's see if travis likes it too...