Major abstraction of plot_waterfalls in MAP 2013-14 project. Also changes to WAR.