Revert "Final update for gitignore and Eclipse prefs"

This reverts commit 1c28fe132ba57a16da0bb4acb772120f5c7fe2ef.