added livestyle for vim
Merge branch 'master' of github.com:kamykaze/dotfiles
Merge branch 'master' of github.com:kamykaze/dotfiles
increased mapping timeout (500ms is proving to not always be long enough)