Update colorscheme options

Moved custom colorscheme options from vimrc to actual colorscheme for
completeness.

Adjusted some colors to better match used colors.

Updated plugins.

Tested-on: magrathea <13 Jun 2014>