Updated with current version from wordpress repo. Added feature to mark current menu item as active on post type taxonomy pages, too.