update testing, cleanup and add vagrant