Update git ignore
Merge remote-tracking branch 'origin/json_work3' into json_work3

Conflicts:
	.gitignore
Remove redundant code, comment out test harness