added .. to aliases
removed osx folder, added osx-defaults to bin and run on Rake