Cleaning up the sparql query interfacing, and sparql query building
Issue #47
Issue 46 + unittesting