Externalizing color scheme configs outside plugin folder

(cherry picked from commit ac952b3d3ffbe8ea33460e98a37eb6ce67a871c1)

vim/plugin/settings/powerline.vim

@@ -1,5 +0,0 @@
-let g:Powerline_symbols='fancy'
-let g:Powerline_theme='skwp'
-let g:Powerline_colorscheme='skwp'
-
-set laststatus=2 "always show the statusline

vim/plugin/settings/solarized.vim

@@ -1,68 +0,0 @@
-if !has("gui_macvim")
-  set t_Co=256
-  let g:solarized_termcolors=256
-endif
-
-hi! link txtBold Identifier
-hi! link zshVariableDef Identifier
-hi! link zshFunction Function
-hi! link rubyControl Statement
-hi! link rspecGroupMethods rubyControl
-hi! link rspecMocks Identifier
-hi! link rspecKeywords Identifier
-hi! link rubyLocalVariableOrMethod Normal
-hi! link rubyStringDelimiter Constant
-hi! link rubyString Constant
-hi! link rubyAccess Todo
-hi! link rubySymbol Identifier
-hi! link rubyPseudoVariable Type
-hi! link rubyRailsARAssociationMethod Title
-hi! link rubyRailsARValidationMethod Title
-hi! link rubyRailsMethod Title
-hi! link rubyDoBlock Normal
-hi! link MatchParen DiffText
-
-hi! link CTagsModule Type
-hi! link CTagsClass Type
-hi! link CTagsMethod Identifier
-hi! link CTagsSingleton Identifier
-
-hi! link javascriptFuncName Type
-hi! link javascriptFunction Statement
-hi! link javascriptThis Statement
-hi! link javascriptParens Normal
-hi! link jOperators javascriptStringD
-hi! link jId Title
-hi! link jClass Title
-
-hi! link NERDTreeFile Constant
-hi! link NERDTreeDir Identifier
-
-hi! link sassMixinName Function
-hi! link sassDefinition Function
-hi! link sassProperty Type
-hi! link htmlTagName Type
-
-hi! PreProc gui=bold
-
-" Solarized separators are a little garish.
-" This moves separators, comments, and normal
-" text into the same color family as the background.
-" Using the http://drpeterjones.com/colorcalc/,
-" they are now just differently saturated and
-" valued riffs on the background color, making
-" everything play together just a little more nicely.
-hi! VertSplit guifg=#003745 cterm=NONE term=NONE ctermfg=NONE ctermbg=NONE
-hi! LineNR guifg=#004C60 gui=bold guibg=#002B36 ctermfg=146
-hi! link NonText VertSplit
-hi! Normal guifg=#77A5B1
-hi! Constant guifg=#00BCE0
-hi! Comment guifg=#52737B
-hi! link htmlLink Include
-hi! CursorLine cterm=NONE gui=NONE
-hi! Visual ctermbg=233
-hi! Type gui=bold
-
-
-" Enforce the colors set here
-au VimEnter * so ~/.vim/plugin/settings/solarized.vim

vim/plugin/settings/yadr-appearance.vim

@@ -1,7 +1,24 @@
 " Make it beautiful - colors and fonts
 
 " http://ethanschoonover.com/solarized/vim-colors-solarized
-colorscheme solarized
+let s:myTheme='solarized'
+exec 'colorscheme ' . s:myTheme
+
+" If there's a custom powerline theme too, load it. Otherwise load the
+" solarized one just so it won't look very bad.
+let s:powerlineCustom="~/.vim/colors-settings/" . s:myTheme . "-powerline.vim"
+if filereadable(expand(s:powerlineCustom))
+  exec "au VimEnter * so " . s:powerlineCustom
+else
+  exec "au VimEnter * so ~/.vim/colors-settings/solarized-powerline.vim"
+endif
+
+let s:colorSchemeCustom="~/.vim/colors-settings/" . s:myTheme . ".vim"
+if filereadable(expand(s:colorSchemeCustom))
+  exec "au VimEnter * so " . s:colorSchemeCustom
+endif
+
+
 set background=dark
 
 if has("gui_running")