Updated the branch

Updated the changes in configuration.inc.php.sample and removed the merge conflict message from tavis/configuration.inc.php which was causing travis tests to fail.