Remove OSX nonsense; added vim settings