- Update ESLint from v3.2.0 to v3.18.0
 - Add a little extra configuration for the "indent" rule which best
   matches our existing practice in the codebase
 - Fix a few places that were inconsistent about indentation