Fix debug stuff
Merge branch 'master' of github.com:greathouse/porpoise