Added support for categories, including new shortcode option. Closes #8