added js2 mode and tweaked some vars
updated the main el file
merged master