Fixing build for MSVC2012
resolving merge conflicts
Fixes Issue 84; Also fixes issue where vector.c...
Merge branch 'msvc_buildfix' into unstable
Fixes Issue 90; Also fixes some issues breaking...
Fixes Issue 87