clean up and small modifications
clean up and small modifications

ekeroid/hopsworks-chef,ekeroid/hopsworks-chef,ekeroid/hopsworks-chef,hopshadoop/hopsworks-chef,hopshadoop/hopsworks-chef,hopshadoop/hopsworks-chef,hopshadoop/hopsworks-chef,ekeroid/hopsworks-chef