extract theme functions into inc files
Merge branch 'master' of github.com:Snipon/unicorn

Conflicts:
	template.php