Some more template juggling: moved head.jade contents to layout.jade etc.