Fixing and reorganizing puppet repo tests
Updating cassettes
Merge pull request #101 from daviddavis/temp/20130812151422

Fixing puppet tests
fixing some documentation
Merge branch 'master' into nodes
cassette update