Updated the bootstrap file a bit and added .vagrant to .gitignore
Added some tests