Fix for eigen alignment on 32 bit machines in site_scons
Merge branch 'master' of github.com:makerbot/json-cpp into Version3.2