cleanup bits from yesterday's merges. Simplify subword-mode setup. Add in bashrc bits.