Add some vim plugins update .vimrc
update bashrd
Merge branch 'master' of github.com:shawnlewis/dotfiles

Conflicts:
	.vim/.netrwhist
	.vim/bundle/pyflakes/ftplugin/python/pyflakes/pyflakes/__init__.pyc
	.vim/bundle/pyflakes/ftplugin/python/pyflakes/pyflakes/checker.pyc
	.vim/bundle/pyflakes/ftplugin/python/pyflakes/pyflakes/messages.pyc
	.vimrc