switch to maven, some breaks

alt+f5 will regenerate the .classpath file, which will make your project look OK again in eclipse. The classpath file itself was removed from the repo to prevent conflicts. Aside from minor changes (breaks where logical, some formatting changes while I was making my way around your code before) that is it :)

Edit: There's a few other changes that leaked in as well I see. From the diffs it looks like no functionality is changed.