NK edits for UPenn Site
Merge branch 'gh-pages' of https://github.com/biveeco/UPenn into gh-pages