Adding Chefspec along with many cleanups