removed thumbs.db, DS_Store
cleaned up merge from master
disable cucumber for now