Delete Final: 
Minor controller fixup
Clean up of tests
Cleanup
Merge pull request #61 from jateeter/master

Delete Final