Renamed files and fixed navbar

1. Renamed files to use lowercase underscore-delimited names (foo_bar)
2. Attempt to fix navbar (2)
3. Added some metadata for _head.html
Fixing conflicts

Fixed Conflicts:
	components/_navbar.html