Rearranged .emacs and removed Sage references
Merged .zile changes in