disabled M-2 for window-sawp -- temporary
added color diff hook
*changed em to alias runemacs instead of emacs
*added alias for svn log as sl