remove log file
Merge branch 'master' of https://github.com/rdeits/adaptive-PIV

Conflicts:
	src/pyPIV/log
add back in switch from assertion to warning