Layout Update - add tumblr & rework header

I moved the includes around a little so that I could include captured
content in the head.html section of the page and have alternative
captured content blocks in <head>