re-syncing

Just re-syncing everything that I had marked up before my github went
insane, going to go through everything and make minor changes that might
not have been saved entirely.