rm junk osx functions, update brewfiles, move functions to shell/functions