standardize indentation at 2 spaces

Some files were 2 spaces, some were 4.  There were more issues when I tried 4 spaces, so 2 it is.