Renamed the options table to options and the tags section to keywords (since tags means something else in gitspeak)