re-organized plugin (no real change)
update aliases to default to current branch, fixes #1601