Cleaning up excess code from makezine.com
Merge branch 'develop' of https://github.com/Make-Magazine/Maker-Camp into develop

Conflicts:
	footer.php