Adding elasticsearch
Updating nginx config
Fixing composer.sls
Changing sites path in pillar
Deeper xdebug depth
Allow user to be passed in git project config
Updating APC config
Adding known_hosts (bitbucket)
Merge branch 'master' of github.com:vespakoen/salt-states

Conflicts:
	php/init.sls