Vagrant 1.5 compatibility

Closes #7
Closes #8