Updated .gitignore and prefs for eclipse
Merge branch 'master' into interface