Synced with GoogleDoc

I finally synced this with the changes I made to the google doc I had up
for beta review. Future updates will be on this copy as I go back and
edit and flesh out the GM section and make updates from playtests.