Made the navigation stuff more flexible by allowing one to specify the subsite. Useful for making master templates for subsites where you want to also generate the tabs for its parent (such as the root subsite), such as .LRN where you've got tabs for the main dotlrn navigation, and subtabs for within-course/community navigation.