Customized Eclipse formatting.
Repair unchecked merge from before.
More prefs I missed. Ignore build.