Merge pull request #354 from mikesherov/indentation

Indentation: prevent false positive when array elements are on same line as array opener, but array is not single line.
Indentation: allow for extra indents when first variable in a declaration is multi-line.