Hook up nav to badges and collections routes
Merge branch 'hook-up-nav' of github.com:stenington/openbadges into 635-header-styles

* 'hook-up-nav' of github.com:stenington/openbadges:
  Hook up nav to badges and collections routes

Conflicts:
	views/layout.html