Merge branch 'master' into fix-headers
make JNWCollectionView.h the umbrella header, rename class header

This is done since JNWCollectionView.h should technically be an
umbrella header, and there's no way for that to happen unless I rename
the current JNWCollectionView.h to something else, since I'd cyclic
imports if I tried to import everything into the current header.
add an umbrella header