Bring .htaccess in line with live site
Move some files for security and ease of configuration
Fix bug that made dojos display twice
Add CoderDojo logo to zen
Merge branch 'master' of github.com:CoderDojo/Zen

Conflicts:
	README.md