reformatting site_base
Merge branch 'pyconca2013' of github.com:pyconca/2013-web into pyconca2013

Conflicts:
	symposion_project/templates/site_base.html
Merge branch 'pyconca2013' of github.com:pyconca/2013-web into pyconca2013