Merge conflicts

.vimrc

@@ -90,6 +90,11 @@ set wildignore+=*_build/*
 let g:syntastic_always_populate_loc_list = 0                                    
 let g:syntastic_auto_loc_list = 0 
 
+" Sane Ignore For ctrlp
+let g:ctrlp_custom_ignore = {
+  \ 'dir':  '\.git$\|\.hg$\|\.svn$\|\.yardoc\|node_modules|public\/images\|public\/system\|data\|log\|tmp$',
+  \ 'file': '\.exe$\|\.so$\|\.dat$'
+  \ }
 Bundle 'https://github.com/klen/python-mode.git'
 map <Leader>g :call RopeGotoDefinition()<CR>
 let ropevim_enable_shortcuts = 1
@@ -171,7 +176,7 @@ set formatoptions+=2 " Use indent from 2nd line of a paragraph
 set formatoptions+=l " Don't break lines that are already long
 set formatoptions+=1 " Break before 1-letter words
 
-colorscheme badwolf
+colorscheme elflord
 
 syntax enable
 filetype plugin indent on