Use 2 space indentation, see https://npmjs.org/doc/coding-style.html
Merge branch 'node-formatting'