add note about optional views
Merge remote-tracking branch 'upstream/master'
line-wrap the CHANGELOG, and update the README
Merge pull request #27 from sethladd/master

README and CHANGELOG updates