add conversion: {plugin|theme} scaffold   ->  scaffold {plugin|theme}

There are good cases to be made for either order, so support both.