merge
merge
Merge branch 'master' of https://github.com/meduz/dotfiles

* 'master' of https://github.com/meduz/dotfiles:
  updating python mode from github
  updating python mode from github
  merge
  merge
  python toolchain
  not doing any gem update
  transition from brewing to casking
  transition from brewing to casking
  merging back from fork
  casking all my applications ...
  merging back some items form the fork
  adding more casks

Conflicts:
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/astroid/__pkginfo__.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/astroid/exceptions.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/astroid/inference.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/astroid/manager.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/astroid/node_classes.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/astroid/protocols.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/astroid/raw_building.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/astroid/rebuilder.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/checkers/classes.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/checkers/exceptions.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/checkers/format.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/checkers/misc.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/checkers/similar.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/checkers/typecheck.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/lint.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/logilab/common/modutils.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/logilab/common/optik_ext.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/logilab/common/ureports/docbook_writer.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/logilab/common/ureports/text_writer.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/reporters/html.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/reporters/text.py
	.vim/bundle/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/utils.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/checkers/classes.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/checkers/exceptions.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/checkers/format.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/checkers/misc.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/checkers/similar.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/checkers/typecheck.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/lint.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/logilab/astng/__pkginfo__.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/logilab/astng/exceptions.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/logilab/astng/inference.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/logilab/astng/manager.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/logilab/astng/node_classes.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/logilab/astng/protocols.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/logilab/astng/raw_building.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/logilab/astng/rebuilder.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/logilab/common/modutils.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/logilab/common/optik_ext.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/logilab/common/ureports/docbook_writer.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/logilab/common/ureports/text_writer.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/reporters/html.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/reporters/text.py
	.vim/bundle/python-mode/pylibs/pylama/pylint/utils.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/astroid/__pkginfo__.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/astroid/exceptions.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/astroid/inference.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/astroid/manager.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/astroid/node_classes.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/astroid/protocols.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/astroid/raw_building.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/astroid/rebuilder.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/checkers/classes.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/checkers/exceptions.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/checkers/format.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/checkers/misc.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/checkers/similar.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/checkers/typecheck.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/lint.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/logilab/common/modutils.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/logilab/common/optik_ext.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/logilab/common/ureports/docbook_writer.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/logilab/common/ureports/text_writer.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/reporters/html.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/reporters/text.py
	libs/python-mode/pylibs/pylama/lint/pylama_pylint/pylint/utils.py