Fix mixing of bracket and non-bracket continuations
Merge branch 'i17'

* i17:
  Fix mixing of bracket and non-bracket continuations

Conflicts:
	spec/indent/continuations_spec.rb
Fix issue with bracket continuations