adam and kim's edits
Merge branch 'develop' of github.com:harvard-lil/perma into develop