Updated some metadata
Fixing d.o D7 link.
Big ol' commit for DC Dallas.
Merging master branch aftr manual conflict resolution.