Conflicts:
	ethdb/database.go

Change number of args passed to NewIterator in print function to reflect changes in the goleveldb project.

parse returns byte array instead of string now

MakeContract in Block is now using the MakeContract defined in
contract.go