Cleaned up diffs

Rolled back some files with inconsequential changes to Casascius' master
to minimize the complexity of the diffs for the upcoming pull request.