Merge pull request #13 from daniel-dgi/7.x

Merge fixes
Filename conventions.
Drupal coding standards.
Merge pull request #15 from nigelgbanks/7.x-filename-conventions

7.x filename conventions
Resolved merge conflicts