A few minor changes, and some IDE specific files, to get thsi project building neatly on Eclipse