Updating xdebug config
Fixing bug in google chrome state, moving tmux to desktop
Fixing duplicate name issue with vagrant
Merge branch 'master' of https://github.com/Vespakoen/salt-states

Conflicts:
	php/files/xdebug.ini