Update README and rename database.php to database-sample.php to prevent overrwriting settings on update
Merge remote-tracking branch 'origin/master'