reverted dbconnect, because git doesn't know how to pull or my editor doesn't know how to read a file
Merge branch 'master' of https://github.com/forcvnp/conservancybird.org