Vastly Improved ES6 & ES7 Support

This release is a fairly major refactor of the syntax highlighting to better support the new features in ES6 and ES7. Also as an added benefit, there is a much more accurate block scope making future updates and additions much easier.