Revert "Factored out nav into partial"

This reverts commit e1739ed67c05686cfb7acfee6b4fff05d3df9f47.
Made git understand how I factored out nav. To maintain application.html.erb's history.