Some Windows fixes for R3
Merge.
Merge branch 'master' of https://github.com/calebegg/proof-pad