Merge pull request #57 from andylyall/2014.03

Pass at fix for Snapshot Create
Include windows images