removing stuff that will be in vagrant, tweaking for OSX