merge
Reverse operators for SIGNEXTEND and bugfix for k > 2**64.
PoC-7: Latest SIGNEXTEND.
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
fix for compiling under llvm
Fix VM test code loading conditions
Merge pull request #436 from debris/develop

fix for compiling under llvm
Merge pull request #438 from imapp-pl/pr-fixes

Fix VM test code loading conditions
Merge remote-tracking branch 'ethereum/develop' into signextend_change

Conflicts:
	libevm/VM.h
Parser fix: Consume break and continue.
Bugfix: Tag takes one byte (for JUMPDEST)
Updated genesis block to new block format.
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
Merge pull request #434 from CJentzsch/vmtraceBugFix

Vmtrace bug fix
Merge pull request #443 from chriseth/bytesRequiredForTag

Bugfix: Tag takes one byte (for JUMPDEST)
Merge pull request #442 from chriseth/sol_fix_break

Parser fix: Consume break and continue.
Merge pull request #435 from chriseth/signextend_change

Reverse operators for SIGNEXTEND and bugfix for k > 2**64.
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
Update astyle options:
- "delete-empty-lines" removed as it removes single empty lines also
- "keep-one-line-blocks" added to keep one-line inline methods implementations
- "close-templates" added - places template angle bracket together
Merge pull request #445 from imapp-pl/pr-changes

Update astyle options