Provide simple word-based argument substitution for !cmd commands.
Accept source aliases.
Merge branch 'master' into parslet
Coalesce superfluous leading @ in keywords (rwbarton).