fixes the javascript syntax highlighting
adds in 'javascript' tags as well as 'js' tags, adds support for off-colored things
adds support for ejs delimiters
resolves merge conflict
Merge pull request #7 from Rdbaker/fix-js-syntax

fixes the javascript syntax highlighting