updates to aliases, rake and git