fix and cleanup
Change options to use Traits
Create test for controller command
block generator command cleanup
block command test
cleanup services generator
adding services command test
services are optional
Merge pull request #99 from dmouse/controller-cleanup

Controller cleanup and test
Merge pull request #100 from dmouse/block-cleanup

Block cleanup
Merge pull request #101 from dmouse/services-cleanup

Services cleanup