Adding safety net for tests
Updated comments
Adding Vagrant