Merge pull request #177 from masondesu/joe-fixes

added city highlights to dc page
fixed template build