Merge pull request #231 from joshayers/ms_compiler_warnings
authorRobert Bradshaw <robertwb@gmail.com>
Tue, 21 May 2013 16:41:02 +0000 (09:41 -0700)
committerRobert Bradshaw <robertwb@gmail.com>
Tue, 21 May 2013 16:41:02 +0000 (09:41 -0700)
Fix several MS compiler warnings.


Trivial merge