Pptx 1.x

Ok, redux.  based on the 1.1 branch.  Feedback welcome!