Resolve merge conflicts
Resolve merge conflicts

* Conflicts arose as a result of a bad merge in cc7ccd2f19c97e49f0dd95b501281d267a4b3650
* Props @jpmckinney for catching it

fedspendingtransparency/fedspendingtransparency.github.io,bpushed/project-open-data.github.io,pjdufour/project-open-data.github.io,fedspendingtransparency/fedspendingtransparency.github.io,judecalvillo/project-open-data.github.io,pjdufour/project-open-data.github.io,portofsandiego/project-open-data.github.io,fedspendingtransparency/fedspendingtransparency.github.io,portofsandiego/project-open-data.github.io,cmurphyUSAID/implementation-guide,judecalvillo/project-open-data.github.io,portofsandiego/project-open-data.github.io,pjdufour/project-open-data.github.io,pjdufour/project-open-data.github.io,Chuck8080/opendata,fedspendingtransparency/fedspendingtransparency.github.io,Chuck8080/opendata,portofsandiego/project-open-data.github.io,bpushed/project-open-data.github.io