Merge windows code.

Signed-off-by: Sean Ogden <positivelyskewed.sf@gmail.com>
windows merge fixes.

Signed-off-by: Sean Ogden <positivelyskewed.sf@gmail.com>
windows merge fixes.

Signed-off-by: Sean Ogden <positivelyskewed.sf@gmail.com>
Merge branch 'windows' of git://github.com/seanogden/e

* 'windows' of git://github.com/seanogden/e:
  windows merge fixes.
  windows merge fixes.
  Merge windows code.
Whitespace fixes