Misc changes

 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   screenrc
	modified:   vim/ftplugin/org.vim
	new file:   vim/templates/vimorg.org
	modified:   vim/vimrc/vimrc_latexsuite
	modified:   vim/vimrc/vimrc_vimorganizer
	modified:   vimrc
Merge remote-tracking branch 'origin/master'