Merge pull request #195 from brethauer/bigmerge

resolves issue 188
Merge pull request #194 from 18F/bigmerge

The big Sprint 5 merge
add links to footer logos
Merge branch 'master' of https://github.com/18F/mirage into bigmerge