Windows compilation changes
Merge branch 'Paul' into derek-refactor
Merge branch 'derek-refactor' of https://github.com/UWB-Biocomputing/BrainGrid into derek-refactor
Merge branch 'derek-refactor' of https://github.com/UWB-Biocomputing/BrainGrid into derek-refactor
Small fixes for compiling refactor