exMachina branch
aliases edit
git dirty test fix