Added Linux to supported list.
Clean up, again.

I'm going to over-engineer this slightly, but for good reason!