Last few fixes since refactoring
Merge branch 'develop' of github.com:openeyes/OpenEyes into develop
[OES-125] - enable debug verbose in composer install step
[OES-125] - try full path to composer in install step
[OES-125] - adding pref source and -n options in composer install step
Composer tweaks
Merge branch 'develop' of https://github.com/openeyes/OpenEyes into develop

Conflicts:
	puppet/classes/composer.pp
[OES-125] - disable jenkins auto run of phantom due to
Process leaked file descriptors. See
https://wiki.jenkins-ci.org/display/JENKINS/Spawning+processes+from+build
More fixes since refactoring
Vagrant changes
Change puppet composer path
Merge branch 'release/1.5' into develop
Change xdebug options
xdebug var fix
xdebug tweak
Merge branch 'release/1.5' into develop
Changed environment variable option names for launching Vagrant
Merge branch 'develop' of https://github.com/openeyes/OpenEyes into develop
[OES-125] - getting a version of the phantom BDD tests running. Need to workout the reason why we have failures
Finished refactoring