Merge pull request #15 from reubot/master

Various fixes
Add comment for commented out Maven executable target
Merge pull request #2 from CUTR-at-USF/master

upstream