Update path. Update basic images helpers / config
Update paths for custom php installation
Merge branch 'mac'

Fast forward dotfiles project based on paths change