git rm --cached is what we needed, not git ignore
blah
Merge branch 'master' of github.com:rsoden/epic