add vim-commentary, vim-haml
Merge branch 'master' of github.com:pmrowla/dotfiles

Conflicts:
	.vimrc