Safety Checks.
Clean up warnings and formatting.
remerge.
Recommit collection view updates.
Forgot delegate passing.
Merge pull request #13 from MattFoley/collectionView

Collection view support