Merge pull request #126 from mgadams/win32_warnings
authorJohn Kessenich <johnkslang@users.noreply.github.com>
Thu, 14 Jan 2016 02:11:05 +0000 (19:11 -0700)
committerJohn Kessenich <johnkslang@users.noreply.github.com>
Thu, 14 Jan 2016 02:11:05 +0000 (19:11 -0700)
Fix several build warnings/error encountered with VS2013


Trivial merge