Added support for vanilla Linux as well as Vagrant

Added support for vanilla Linux as well as Vagrant.