Revert splitting of mojo into two parts

This Pull Request fixes #30 by pulling the two mojos back into 1. The split mojos worked on the command line but not through M2E, which is a required feature for me as I am updating the ontologies and using them interactively in Eclipse as I go. This pull request attempts to revert #19 while keeping the subsequent bug fixes.