Feanil/vagrant updates

Updates to make the vagrant image work.