added winmove to emacs, color to ls
Merge branch 'master' of https://github.com/ddetone/dotfiles