Max's Updates before i mess with it

Also including .classpath and .project so the Eclipse project can be
recreated more easily. All future github commits should include them
automatically.