Update aliases, mostly zipcar ones.
Resove minor merge conflict