Only use catalog_product_flat indexer if flat products are enabled
Merge pull request #176 from nhp/upstream

Only use catalog_product_flat indexer if flat products are enabled
Merge branch 'master' into develop
Added increment_id to importable customer fields
Merge remote-tracking branch 'upstream/develop' into develop