Merge branch 'conversion' into develop

Godeps/Godeps.json

Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go

...orkspace/src/github.com/ethereum/ethash/js/cache_sizes.js

..._workspace/src/github.com/ethereum/ethash/js/dag_sizes.js

...ps/_workspace/src/github.com/ethereum/ethash/js/ethash.js

..._workspace/src/github.com/ethereum/ethash/js/package.json

...kspace/src/github.com/ethereum/ethash/js/test/seedHash.js

..._workspace/src/github.com/ethereum/ethash/js/test/test.js

Godeps/_workspace/src/github.com/ethereum/ethash/setup.py

...src/github.com/ethereum/ethash/src/libethash/data_sizes.h

...ace/src/github.com/ethereum/ethash/src/libethash/ethash.h

...e/src/github.com/ethereum/ethash/src/libethash/internal.c

...e/src/github.com/ethereum/ethash/src/libethash/internal.h

...orkspace/src/github.com/ethereum/ethash/src/python/core.c

..._workspace/src/github.com/ethereum/ethash/test/c/test.cpp

...ps/_workspace/src/github.com/ethereum/ethash/test/test.sh

blockpool/blockpool.go

blockpool/blockpool_test.go

blockpool/blockpool_util_test.go

blockpool/config_test.go