Tim branch

I don't think my changes to any of the files I didn't write will break anything, they were mainly adding/removing blank lines by accident. I'm worried the .classpath and .settings will be messed up for you guys, so I can fix that tomorrow (monday) as needed