Updates database.yml on local repo
Merge branch 'master' of https://github.com/jasonwc/handthatfeeds
Pulls master into recent commit and push
Fixes all contact_us funcitonality