Merge branch 'feature/network-graph' of https://github.com/DanielReid/addis-core into develop
Merge branch 'develop' of github.com:ConnorStroomberg/addis-core into develop
Merge branch 'feature/triplestore' of github.com:ConnorStroomberg/addis-core into feature/triplestore

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
refactor triple store bug fixes, WIP