Update to Nav's zipped trunk

Tested, seems to work fine