Modified bashrc
Merge branch 'master' of github.com:carlesfe/dotfiles

Conflicts:
	.vim/ftplugin/python/pyflakes/pyflakes/__init__.pyc
	.vim/ftplugin/python/pyflakes/pyflakes/ast.pyc
	.vim/ftplugin/python/pyflakes/pyflakes/checker.pyc
	.vim/ftplugin/python/pyflakes/pyflakes/messages.pyc