Added some minor modes and auto-mode-alist
Added variables for svn
merge commit