Merge pull request #121 from awolfe9/master

Getting windows images working again. Mac is probably still broken post-refactor