Refractor code and update gitignore

gitignore now excludes .classpath and .project,
which were getting annoying.
Merge pull request #8 from comscript/refractor

Refractor code and update gitignore