Merge pull request #3 from Raxa/master

Cleanup
Merge pull request #4 from Raxa/ctakes-service-java

Merge pull request #3 from Raxa/master