re #48 - Cleanup and using remove location for JS assets
re #48 - Use remove favicon
Merge branch 'master' of github.com:nooku/guides.nooku.org

Conflicts:
	theme/assets/images/favicon.ico
	theme/templates/layout.html