use the include syntax in jingja2
Merge branch 'master' of github.com:MeroCloud/thomas

Conflicts:
	thomas/homepage/mod_home/views.py
	thomas/homepage/templates/home/blog_header.html
	thomas/homepage/templates/home/blog_post.html
	thomas/homepage/templates/home/default.html
	thomas/homepage/templates/home/footer.html
	thomas/homepage/templates/home/navbar.html
	thomas/homepage/templates/home/sidebar_ad.html
	thomas/homepage/templates/home/sidebar_archive.html
	thomas/homepage/templates/home/sidebar_link.html
	thomas/homepage/templates/home/sidebar_notice.html