Update ESLint
babel-eslint is no longer necessary: ESLint now supports what we
need (in this case it was trailing commas). Fix lint errors with a
mix of updating lint rules to match our style, minor code fixes
and one ignore (I can't see whay it dislikes this one and not the
one above...)
