Fix for persnickety compiler
Merge branch 'dev' of https://github.com/amplab/snap into dev