w
Merge branch 'master' of github.com:everett1992/dotfiles

Conflicts:
	vim/bundle/ctrlp.vim
	vim/bundle/powerline
	vim/bundle/tagbar
	vim/bundle/vim-markdown
	vim/bundle/vim-rails
	vim/bundle/vundle