Added some windows defines
Added a define around boost for windows builds
Merge branch 'master' into dev