Removed actual database.yml file

Obviously we dont want to store the actual database.yml file inside our
git repo.
Updated .gitignore
Merge remote-tracking branch 'origin/master'