fix bugs
Merge branch 'master' of github.com:raven-debridement/master-control
Merge branch 'master' into gkahn
Debridement works relatively well! hurrah