toggle appveyor build
update conda
Merge branch 'master' into appveyor
well that update didn't seem to go so well
more changes to get the test suite working on windows
syntax error
Merge pull request #488 from rmcgibbo/appveyor

Minor changes for full passing test suite on Windows CI servers