minor changes
flakes; begin taking apart pysh since it won't be merged into ipython core