OK, I was an idiot. I discovered this morning that I had my PI set up to source nat the VPN connection to the IP address it has when hooked up to my ISP supplied router. When I changed that to use the IP address it has when hooked up to the Almond+, everything started working. So now I have VPN access to the home automation stuff, which is what I wanted.