diff --git a/.bash_aliases b/.bash_aliases
index 43fcd2b..f0c3fe0 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -43,6 +43,7 @@ alias la='ls -alF'
 #alias l='ls -CF'
 
 alias vi='vim'
+alias em='emacs'
 alias grep="grep --color=auto"
 alias screen="screen -R"
 alias dvtm="dvtm -m \"^w\""
diff --git a/.vimrc b/.vimrc
index fa88da5..e60aaf5 100644
--- a/.vimrc
+++ b/.vimrc
@@ -30,6 +30,14 @@ set wildmenu
 set wildmode=list:longest
 set ruler
 
+set splitbelow
+set completeopt=menu,menuone,longest
+" If you prefer the Omni-Completion tip window to close when a selection is
+" made, these lines close it on movement in insert mode or when leaving
+" insert mode
+autocmd CursorMovedI * if pumvisible() == 0|pclose|endif
+autocmd InsertLeave * if pumvisible() == 0|pclose|endif
+
 " Some stuff for console 256 Colors
 set t_Co=256
 set t_Sf=ESC[3%dm
@@ -52,7 +60,7 @@ runtime macros/matchit.vim
 autocmd FileType ruby,eruby set omnifunc=rubycomplete#Complete
 autocmd FileType python set tags+=$HOME/.vim/tags/python.ctags
 "autocmd FileType python set omnifunc=pythoncomplete#Complete
-"autocmd FileType python call SuperTabSetCompletionType("<C-X><C-O>")
+autocmd FileType python call SuperTabSetCompletionType("<C-X><C-O>")
 let python_highlight_all = 1
 let g:Tb_MaxSize=0
 let g:Tb_MapCTabSwitchBufs = 1