diff --git a/vimrc b/vimrc
index d57c176..972d0b9 100644
--- a/vimrc
+++ b/vimrc
@@ -53,7 +53,7 @@ let g:ctrlp_custom_ignore = {
 " Disable AutoComplPop.
 let g:acp_enableAtStartup = 0
 " Use neocomplete.
-let g:neocomplete#enable_at_startup = 1
+let g:neocomplete#enable_at_startup = 0
 " Use smartcase.
 let g:neocomplete#enable_smart_case = 1
 " Set minimum syntax keyword length.
@@ -224,6 +224,7 @@ colorscheme solarized
 " From http://stackoverflow.com/a/5004785/2766106
 set list
 set listchars=tab:╾╌,trail:·,extends:↦,precedes:↤,nbsp:_
+set showbreak=↪
 
 filetype on
 filetype plugin on