Eclipse settings

Reached stable point, doing the final merge.