Merge branch 'develop' of https://github.com/projectchrono/chrono
fixed some issues w/ msvc 2013
Merge branch 'master' of https://github.com/jcmadsen/chrono