DataViewMixin removed and functionality moved to DataView
DataCollectionViewMixin removed and functionality moved to DataCollectionView
Merge pull request #9 from cleandart/removeUnnecessaryMixins

Remove unnecessary mixins
merge with master
added empty lines before when, then