Bringing a bunch of things up to WP formatting standards
More code clean-up

Bringing things up to WP standards
Minor search cleanup
Merge branch 'master' into december-archive

Conflicts:
	page-archive.php