Composer tweaks
Merge branch 'develop' of https://github.com/openeyes/OpenEyes into develop

Conflicts:
	puppet/classes/composer.pp