merge colors to avoid solarized error
update to neobundle and tweak related settings