The Merge should now be complete! Please revert if anything was removed accidentally or that you would like to be replaced. Especially revert if any problems/regressions are noticed! - Valeska

I almost made a very complicated and unneeded change instead of just leaving it as it is because I didn't think of this. So I want this to be here so everyone can understand how this works.

This reverts commit 1dc21e5bc5.

* May bike-shed the ipv4 address to a class A.

* 172 is generally used for auto-config... so it fits
  well with the ad-hoc mesh nature of Netsukuku
* IPv6 could be limited to a uni-cast local address
  as well.

* Style varied wildly between files and within files.
* find . -name "*.c" -exec indent {} -ut -ts4 -kr -psl \;
* find . -name "*.h" -exec indent {} -ut -ts4 -kr -psl \;