Merge pull request #828 from jonas054/more_strict_indentation_width

More strict IndentationWidth
Fix message from EndAlignment when AlignWith is keyword

The 'var =' was incorrectly included in the message.