More cleanup and formatting - still need to figure out fixed bottom margin.
Fix the require_once to use the template directory
Merge origin/master

Conflicts:
	header.php
	index.php