Content Views: Removing more old models

Content Views: Removing more old content view definition models. Also, got
tests to pass.
Merge pull request #3626 from daviddavis/temp/20140127142214

Content Views: Removing more old models