Merge pull request #12 from krujos/master

Write identity file to Vagrantfile
Merge remote-tracking branch 'upstream/master'