Merge pull request #31 from trainingwheels/remove-cruft

Remove crufty cruft
Merge branch 'master' into plugins