Added options for W3C validating and revisioning
Updated
Extended options
Fixed faulty nesting
Merge branch 'master' into minor-features

Conflicts:
	config.json
	templates/js-guide.html
Merge branch 'master' into minor-features

Conflicts:
README.md
config.json
Committing fixes for weird ass conflicts
Reflected changes in docs, added Piwik tracking
Updates and tweaks to existing content
Added updates
Merge branch 'minor-features'