Merge pull request #2 from aylward/ExpectedTestFailuresOnWindows

Expected test failures on windows
ENH: Bump jsoncpp version to support VS Express 2012
Merge pull request #197 from aylward/Merge

Merge