header singleton stuff now in the default page template
footer, fixed bug in styleguide
plugged in nav and header links, tweaks
resolved merge