Move paths so default build dir is cpp-ethereum/build.
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop