remove stuff I dont want
add brew file
fix merge conflicts