Added OSX niftiness from home compy, reorganized a bit