preparing merge

- undo unnecessary changes to GE_NK (for now, maybe replace GE_NK with
GE_NK_adjcost later)
- update gitignore
- added persistence in mod file, and the no-arbitrage eqn in the doc