Merge branch 'master' into Cole
finagle footer stuff
Merge branch 'Cole'