Issue 13

Cleanup of some machine-specific IDE files. Fixed some POM dependencies, tests, and code.