Update README.md

correct path to main.js
Merge branch 'master' into gh-pages
moved main.js from scripts/ to javascripts/ + few other tweaks
corrected path to main.js in README.md
cherrypick: moved main.js from scripts/ to javascripts/ + few other tweaks

Conflicts:
	index.html
	javascripts/main.js
corrected path to main.js in README.md
Merge branch 'master' into gh-pages