Merge pull request #1 from LucasJones/0.8.1

Changed references of 'bitcoin' to 'bytecoin'.
Merge Mining patch to use bitcoin as a primary chain

Conflicts:
	src/rpcmining.cpp

	new file:   contrib/merged-mine-proxy
	new file:   src/auxpow.cpp
	new file:   src/auxpow.h
	modified:   src/bytecoinrpc.cpp
	modified:   src/bytecoinrpc.h
	modified:   src/db.cpp
	modified:   src/main.cpp
	modified:   src/main.h
	modified:   src/makefile.unix
	modified:   src/rpcmining.cpp
	modified:   src/txdb.cpp
Merge Mining patch to use bitcoin as a primary chain

Conflicts:
	src/rpcmining.cpp

	modified:   src/rpcmining.cpp
Merge Mining patch to use bitcoin as a primary chain

Conflicts:
	src/rpcmining.cpp

	modified:   src/rpcmining.cpp