Final changes for p5

git-svn-id: https://pennmush.googlecode.com/svn/trunk@1823 ba372814-4f39-11de-9ad6-1127a62b9fcd