first pass at versioned support
BUGFIX: Remove Buttons.php
A number of enhancements and bug fixes for verioned support.
Merge branch 'versions'