Merged in geocron stuff for new version
Fixed some weird conflict text in this file.
Merge branch 'master' of github.com:UngodlySpoon/ns3 into geocron