Revert "Fixes #227, closes #224 and fixes #228"

This reverts commit e3c54c58b47ee390276a1350f129d811012a0816.
Revert "renamed bootstrap"

This reverts commit 7730904e9338411bce75ceeb97ac498b98b3f3d7.
Merge branch 'master' of github.com:Olivine-Labs/busted
Version 1.11.1