Update jruby opts and ruby to 2.1.3
Update vim-airline
Merge branch 'master' of github.com:dalizard/dotfiles