Merging adds strange things

Took out strange things.  Files push fine to my branch, but don't push or merge right to gh-pages