Pull Request with "codebase house keeping" items

Andrew,

Here are two modifications that I would recommend for ease of development in Eclipse Kepler and using the M2Eclipse plugin.

Let me know if you have questions.

Cheers,

John