Fleshing out the classes, methods and attributes.

Having Muppet::Expect and Muppet::Function seems to be adding a lot of
attribute passing between Function and Expect. Also there is a real
blurring of responsiblity. It feels that the best thing to do would be
merge the classes simply for simplicity and move on with the code.