Spike stuff
Merge branch 'remy' of github.com:hbatmit/ns2.35 into remy