Merge
Install JSLint support
Updates