Issue #73 merge ipaddr

Kind of a big merge that could affect third-party things. Sorry but it needed to be done!

- Merges ipv4/ipv6 into ipaddr field.
- Cleans up hping a bit
- Adds restful api (in progress)