Merge pull request #1 from cassiel/master

Ignore on unfinished code.
Merge pull request #5 from rothmichaels/master

Moving packages.
Updated .gitignore.

Now ignoring:

- .DS_Store
- Emacs files
- Eclipse project files