changes spanning several months' time. i cannot possibly know what they are
Merge branch 'revamp' of https://github.com/glinka/448_final_project into revamp