adding eclipse files to the .gitignore
eclipse seems to insist on adding a tmp entry to .gitignore
fixing up a couple of minor typos and grammar
Merged changes from David Nickerson & Chris Myers.

1. Merged David Nickerson's pull request.
2. Fixed merge conflict between that and Chris Myer's edits earlier today.