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

* 'master' of https://github.com/anthonyangel/dotfiles:
  add pycharm

Conflicts:
	.cask
remove cask