Various edits
Merge ipv4 and ipv6 sections
Merge branch 'master' of github.com:mallegonian/mal-configs