Use 2 spaces for intentation when editing javascript.
-- disable indent guides by default
Merge remote-tracking branch 'upstream/master'