Merge pull request #22 from gcborders/master

Pull Master to Jim
Merge pull request #23 from gcborders/master

Pull Gregg's Button Changes
Merge pull request #24 from gcborders/jim_backup

Jim backup