add rvm_path for cap deploys
increasing foldnestmax
adding subs
dark colorscheme
vim-surround & vim-scala
merging