update categories and tags, clean up markdown from tumblr conversion