Expand a bit on when to indent by 2 or 4 spaces.

This commit expands a bit on the indentation guidelines, and tries to explain which forms require 2 space indentation, and which just require vertical alignment.

It rewrites a bit a couple of rules we already had, do complain if it oversteps.