merge back into splitbrain/docker-phpfarm

[splitbrain]

Hi,

I just stumbled about your excellent work in this fork and was wondering if you'd mind merging it back into the original repository. I'd be happy to give you commit access there.

[eugenesia]

Hi @splitbrain I'm happy to merge back... I was afraid it would mess up your repo as I've moved it very far beyond your repo. I'm using PHPFarm regularly and have some items on the roadmap, which I've put into my issue queue.

I'll send you a merge request.

Yes it'll be great for me to have commit access so I can add new features / update old features. Thanks!