Fix merge conflict
create editor file
Remove hidden files from ll
Change vi mode to emacs
Fix merge conflict
Add ATI power management aliases and coloured directory listings
Use diff3 for merge conflicts
Add home bin to path
Un-vimify inputrc
Enable arrow keys