More work towards #2. All of storm/include/generic is now done. All in all in storm, we only have 24 files left with the GPL header remaining.