Travis, suck on this!
Merge pull request #359 from kkoopa/damn_you_travis

Travis, suck on this!