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

* 'master' of https://github.com/meduz/dotfiles:
  making 2 cask layers
  chmod
  exiting merge hell ;  adding python-mode
  exiting merge hell ;  adding python-mode
  merge
  merge
  merge
  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:
	init/osx_cask_base.sh
	init/osx_cask_full.sh