Added function to simplify system settings forms that utilize AJAX.
Merge pull request #257 from nigelgbanks/7.x-system-settings-form-default-value

Added function to simplify system settings forms that utilize AJAX.
Filename conventions.
Drupal coding standards.
Merge pull request #258 from nigelgbanks/7.x-filename-conventions

7.x filename conventions and coding standards compliance
Added method to retreive basic ds_comp info
Merge pull request #259 from ajstanley/7.x

Added method to retrieve basic ds_comp info
Issue: 1013 MARCXml module ingest hook conflicts with Newspaper/Book page ingest

Clean up the ingest form code, and make it easier to interact with.
Merge pull request #260 from nigelgbanks/7.x-ingest-index-problem

Issue: 1013 MARCXml module ingest hook conflicts with Newspaper/Book pag...
edit conflicts

edited conflicts in the islandora.module and islandora.info files