Added get_block and path_token functions.
Merge branch 'brownyoda' into cevans

Conflicts:
	util.c
	util.h