Address roundtripping concerns [1] and [4] in issue #87.
Add explicit special casing for file objects (py2 only), so they still come out as None
Merge pull request #88 from marcintustin/master

Address roundtripping concerns [1] and [4] in issue #87.

Signed-off-by: David Aguilar <davvid@gmail.com>