update for PPoPP 2015
Merge pull request #17 from dgrove-oss/master

update for PPoPP 2015