#562 added vagrant support
Merge pull request #565 from joola/feature/#562b

#562 added vagrant support