Add update_network_conf_files option
Remove comment in cgconfig.conf if it exists from previous runs

Should resolve Issue 301 completely
Merge pull request #315 from sdodson/Issue301

Remove comment in cgconfig.conf if it exists from previous runs
Merge pull request #286 from andrewklau/add_update_network_options

Add update_network_conf_files option
Introduce OSE specific configuration defaults
Clean up install_cartridges a bit more
Merge pull request #314 from sdodson/enterprise-2.2-merge

Introduce OSE specific configuration defaults