Add Mislav Marohnić's ansi2html script
Mark all git conflicts in the current merge as resolved
Helpers to display your local IP address, both v4 and v6
Add local-ip-address and local-ipv6-address
Add aliases for stroke and airport