Merge pull request #29 from ndorf/master

ipsec fixes & other cleanups