aarellano: updates osx settings
Moves negroku inclusion to the main manifest