Hi Cat / wpatch,
I have the same issue here. Just remove the default slug from shortcode_atts() method:
Change that line:
extract( shortcode_atts( array('theslug' => 'general-questions'), $atts, 'faq' ) );
To:
extract( shortcode_atts( array('theslug' => ''), $atts, 'faq' ) );
=)