FileOps + TextFile tests
cleaning up gitignore
fixing merges
Fix #1