Changes to included dependencies.

Reverts patch application for navbar, it no longer seems to apply
either in reality using git patch, or in code.  It seems other
refactoring elsewhere has resolved the issue.

In addition we swithc back to a dev branch, but specify a commit
for the feeds_json_path_parser library.