added context item to delete waveform from cache
Merge branch 'master' into remove_from_cache
some small code cleanup
added option to select number of samples
fixed seeking (among other things)
fixed coding style
Merge branch 'master' into remove_from_cache

Conflicts:
	cache.c
	cache.h