One image and macros enable/disable figures
Merge branch 'master' of github.com:deian/nsdi2014