minor cleanups
Merge branch 'master' of https://github.com/youvegotmoxie/i7z

* 'master' of https://github.com/youvegotmoxie/i7z:
  minor cleanups

Conflicts:
	helper_functions.c
	i7z.c
	i7z.h