Update website with less snark and @InjectViews.
Merge branch 'jw/collections'