fix git ignore file

Conflicts:
	.gitignore
	CMakeLists.txt
	tests/CMakeLists.txt
Fix gitignore
Minor parsing rewrite, interim version