getting started with IntelliJ IDE is out of sync

[macginitie]

I tried to fix part of the mismatch here:
master...macginitie:patch-1

[macginitie]

also master...macginitie:patch-2

[SethTisue]

would you like to submit those changes as a pull request?

[macginitie]

sure, I'm new here & didn't want to submit a PR without at least someone looking at it. I'll submit them, thanks

[gkepka]

Completed by #1773 and #1774