NOJIRA: Updates to eclipse prefs files, which shouldn't be checked in.
NOJIRA: Remove Eclipse settings files that should not have been checked in.
NOJIRA: Remove Eclipse settings files that should not have been checked in.
Merge branch 'ucb-deploy_3.2' into botgarden_3.2
NOJIRA: Add some Eclipse files to .gitignore.
NOJIRA: Add some Eclipse files to .gitignore.
Merge branch 'ucb-deploy_3.2' into botgarden_3.2
Merge branch 'botgarden_3.2' into UCBG-212