fixed git aac/aaca aliases, added fo alias
removed cdf alias (using marks now)