Just a couple of minor issues with the above template:
With inventory control set as "leave on site but don't allow purchase", when a product is out of stock, the Add To Cart button is hidden. No problems there. However, when the product is in stock but has attributes set on it, it also hides, giving the impression that the product is out of stock. Can we have a couple of extra buttons that state that the product is either out of stock, or requires user input? Just to avoid customer confusion. I seem to remember that Beta1 had a "More Detail" button which did give the impression that there was something else required.
Secondly, when the item is out of stock, the Quantity text box doesn't hide along with the Add to Cart button. Could this be done just to tidy up the view?