Minor fix
File renaming

Changed all files in /network/ of the form .*-.p\.txt to .*.p\.txt; ex.
"butter-2p.txt" -> "butter2p.txt."

Also fixed merge conflict on butterflingers; reverted to earlier commit.

Finally, Teaparty has been moved from /network/serious/ to /2p/ on account
of it not actually being remotely finished yet.