updated module layout
Merge branch 'master' of github.com:cmoad/drupal-heroku
merge modules