Merge pull request #242 from dankennedy/master

Support for marshalling inet values using strings and net.IP
Merge remote-tracking branch 'upstream/master'
re-synced fork with master