Fixed some final issues Renee discovered, and made some text adjustments.
Merge branch 'master' of https://github.com/cdlib/shortcake