added title, made cosmetic changes
removed prompts
resolved conflicts
Merge pull request #24 from ajstanley/7.x

7.x
removed prompt
Merge pull request #25 from ajstanley/7.x

removed prompt
Filename conventions.
Drupal coding standards.
Forgot to move the theme file.
Merge pull request #26 from nigelgbanks/7.x-filename-conventions

7.x filename conventions and coding standards compliance
1013 MARCXml module ingest hook conflicts with Newspaper/Book page ingest

Clean up the ingest steps.
Merge pull request #27 from nigelgbanks/7.x-ingest-index-problem

1013 MARCXml module ingest hook conflicts with Newspaper/Book page inges...
Merge branch '7.x' of github.com:Islandora/islandora_solution_pack_collection into 7.x
merging current islandora to local. now pushing back to my local repository