Fix #213: block-indent vs include

Update Gonzales and add tests