Added some ls aliases
Merge in changes from origin