added nav extras functionality even when no "primary" custom menu is specified, cleaned up stuff, removed extraneous files