Whoops (fixing derpy typo)
Merge branch 'master' into topic
Removing some todo items, since it's not clear to me what _really_ needs to be done, or why
Merge branch 'derp' into topic