Update ish 2.0

ish 2.0 is pretty much complete, minus a couple bug fixes.