Use switch for parsing arguments.
Change default save behavior.
Merge branch 'master' into read
It's ugly, but I think it's mostly resolved.

Conflicts:
	main.c