some updates with schema and database.yml and preparing for testing
Merge remote-tracking branch 'origin/master'