Revert "Remove forced #defines"

This reverts commit 5dfab798470d665b373fe0730634a0e62580f0b8.
Revert "Revert "Remove forced #defines""

This reverts commit a3998cae24b4eafb1e326ee491d47e5dd4dc394f.
Revert "serialization #defines not visible to VS2013; add manually"

This reverts commit fa806957bc906ba2ff0197c7999f25a2d677a9a5.
Merge branch 'vs2013-compile-errors' of https://github.com/smikes/openmm into vs2013-compile-errors
remove redundant setting of #defines