cleanup
Merge branch 'master' of github.com:ebuchman/BTCaddress

Conflicts:
	BTCaddress/src/addrgen.c