Ignore database.yml and provide example instead
Merge branch 'master' of github.com:shanear/shane