Improve indentation function

Prevent E129 when lining up with open parentheses would indent to same
level as next line
Add elif to the control_structure pattern