Revert "more bones update merges"

This reverts commit a73d0b7314b22491ca3ec88c358630b8d9b11bd7.
Revert "update page_navi calls to bones_page_navi (re:bones update)"

This reverts commit 38bb30eb458aa3d03e3b3c15364263be7a9e695c.
Revert "Revert "update page_navi calls to bones_page_navi (re:bones update)""

This reverts commit d9574eab46adf94f4e7b8215c3ce137063a73276.
stupid ds_store...