Added autoswap plugin. Minor textual tweaks.
Merge upstream.