Merge tag '14-08-01' into develop

Creating release branch 14-08-01.  New version of Drupal and updated modules.
Removing settings.php file from repo.