Revert #174 and re-apply interim changes

[ryanblakeley]

@codeaholicguy hey, would you mind giving this a quick review?

[codeaholicguy]

LGTM

[codeaholicguy]

@rojobuffalo Should fix linter before merging

[ryanblakeley]

It's a false positive from the linter: see related issue. A comma after ...rest is a syntax error, so our eslint rule comma-dangle: ["error", "always-multiline"] is supposed to allow there not to be a comma in this special case.

I see 3 options:

1. Let it through with an error reporting a false positive.
2. Try upgrading babel-eslint.
3. Temporarily disable the eslint rule or inline disable

[codeaholicguy]

I think update .eslintrc is the best way to do this

[ryanblakeley]

Turns out putting the } = this.props on the same line with ...rest silences the error. This is sort of letting the tail wag the dog, but whatever.