new windows ami for testing
fixed doctest issues, I think
Merge pull request #1715 from JustinSGray/dev

fixes for test environment.