Commiting my changes to merge with Les'.
Merge branch 'master' of https://github.com/benjaminlackey/StackBNSPaper
All my changes consistent with Les' and Jolien's comments.