REBASEME: Initial astyle run

Mainly for spaces -> tabs.