Moved stuff to local. Moved some aliases to mac only