Added a few features to aid testing buchets
Merge pull request #3 from robhudson/features

Added a few features to aid testing buchets