First commit after moving in files restored from CrashPlan.
Some modifications to get the CrashPlan version to run.
Merge remote-tracking branch 'personal/feature/restore-from-crashplan'
Revert "A few more edits."

This reverts commit 57cb4acca0849b535a9f15a84e0a80f2f71507d1.