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
Paranoia mode fixed for the new trie format.
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
h256 to EmtpryTrie when creating contract