MT upgrade

Upgraded to 3.31. Also migrating all my keywords to tags. Probably some funkiness until I figure out all the tagging stuff.