added generator 2 and fixed vagrant file