Fixing xdebug config file path, adding default config
source rvm startup script
Merge branch 'master' of github.com:Vespakoen/salt-states