Merge branch 'master' into cv-merge-master-again
Merge pull request #70 from daviddavis/cv-merge-master-again

Merging in master to content views