fix and cleanup
Change options to use Traits
Create test for controller command
Merge pull request #99 from dmouse/controller-cleanup

Controller cleanup and test