misc fixes.
fix merge conflict.

Merge branch 'master' of https://github.com/maxime01/btc

Conflicts:
	src/script.c