More merging with radlab repo
Merge branch 'MAPQ-matei' of https://github.com/amplab/snap into MAPQ-matei