Cleaned up warnings.
Converted Features to use MockResource and clarified Controller class
names.
Merge branch 'master' of github.com:jfs/mechjack