Make snapshotting box-aware
Merge pull request #456 from ppp0/issue-456

Fix vagrant snapshot regression bugs