Update from drunomics office.
Merge branch 'master' of https://github.com/maximilianmikus/dotfiles

* 'master' of https://github.com/maximilianmikus/dotfiles:
  Updating settings.jar.
  Updating node path.
  Adding yeoman node path.
  Adding phpbrew.
  Updating aliases.
  Updating settings for phpstorm.
  Adding composer dir.

Conflicts:
	.aliases
	phpstorm/settings.jar