Revert "Merged in hndrewaall/bpython (pull request #21)"

This reverts commit c4c1c864edf2a3c55175c10ab91ea046a9c5fe9a, reversing
changes made to 39bbbd6871e0c12adb9e2bdc1921a6d230b2fef9.