Fix IPAddress and IPEndPoint parsing from JSON
Merge pull request #137 from pgermishuys/dev

Handle more json serialization exceptions in a more user friendly way
Re-evaluate options after particular points to ensure that we can accurately determine where the options came from.