Merge branch 'master' of https://github.com/metagraph/metagraph

Conflicts:
proposal/proposal.tex